[Koha-cvs] koha circ/circulation.pl koha-tmpl/intranet-tmp... [dev_week]

[Kyle Hall]

CVSROOT:        /sources/koha
Module name:    koha
Branch:         dev_week
Changes by:     Kyle Hall <kylemhall>   07/11/01 13:43:27

Modified files:
        circ           : circulation.pl 
        koha-tmpl/intranet-tmpl/ccfls/en/circ: circulation.tmpl 
        koha-tmpl/intranet-tmpl/npl/en/circ: circulation.tmpl 

Log message:
        Checkbox for non-renewable items also disabled automatically for 
circulation.pl

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/koha/circ/circulation.pl?cvsroot=koha&only_with_tag=dev_week&r1=1.81.2.14.2.23&r2=1.81.2.14.2.24
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/ccfls/en/circ/circulation.tmpl?cvsroot=koha&only_with_tag=dev_week&r1=1.1.2.1.2.21&r2=1.1.2.1.2.22
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/npl/en/circ/circulation.tmpl?cvsroot=koha&only_with_tag=dev_week&r1=1.6.2.17.2.11&r2=1.6.2.17.2.12

Patches:
Index: circ/circulation.pl
===================================================================
RCS file: /sources/koha/koha/circ/circulation.pl,v
retrieving revision 1.81.2.14.2.23
retrieving revision 1.81.2.14.2.24
diff -u -b -r1.81.2.14.2.23 -r1.81.2.14.2.24
--- circ/circulation.pl 16 Aug 2007 16:14:56 -0000      1.81.2.14.2.23
+++ circ/circulation.pl 1 Nov 2007 13:43:26 -0000       1.81.2.14.2.24
@@ -295,6 +295,8 @@
                # ADDED BY JF: NEW ITEMTYPE COUNT DISPLAY
                $issued_itemtypes_count->{$book->{'itemtype'}}++;
 
+                $book->{'renewstatus'} = renewstatus(my $nothing, 
$borrowernumber, $book->{'itemnumber'});
+
                my $dd = $book->{'date_due'};
                my $datedue = $book->{'date_due'};
                #$dd=format_date($dd);

Index: koha-tmpl/intranet-tmpl/ccfls/en/circ/circulation.tmpl
===================================================================
RCS file: 
/sources/koha/koha/koha-tmpl/intranet-tmpl/ccfls/en/circ/Attic/circulation.tmpl,v
retrieving revision 1.1.2.1.2.21
retrieving revision 1.1.2.1.2.22
diff -u -b -r1.1.2.1.2.21 -r1.1.2.1.2.22
--- koha-tmpl/intranet-tmpl/ccfls/en/circ/circulation.tmpl      31 Aug 2007 
11:40:43 -0000      1.1.2.1.2.21
+++ koha-tmpl/intranet-tmpl/ccfls/en/circ/circulation.tmpl      1 Nov 2007 
13:43:26 -0000       1.1.2.1.2.22
@@ -363,7 +363,7 @@
                        <td><!-- TMPL_VAR NAME="itemcallnumber" --></td>
                        <td><!-- TMPL_VAR NAME="barcode" --></td>
                        <td><!-- TMPL_VAR NAME="holdingbranch" --></td>
-                       <td><input type="checkbox" name="renew_item_<!-- 
TMPL_VAR NAME="itemnumber" -->" value="y"<!-- TMPL_IF NAME="od" --> 
checked="checked"<!-- /TMPL_IF --> /></td>
+                       <td><input type="checkbox" name="renew_item_<!-- 
TMPL_VAR NAME="itemnumber" -->" value="y" <!-- TMPL_IF name="renewstatus" --> 
<!-- TMPL_IF name="od" -->checked="checked"<!-- /TMPL_IF -->  <!-- TMPL_ELSE 
-->disabled <!--/TMPL_IF--> /></td>
 <!-- HIDE FOR CCFLS
                        <td><a href="/cgi-bin/koha/circ/returns.pl?barcode=<!-- 
TMPL_VAR name="barcode" -->">Return</a></td>
 END HIDE FOR CCFLS -->
@@ -387,7 +387,7 @@
                        <td><!-- TMPL_VAR NAME="itemcallnumber" --></td>
                        <td><!-- TMPL_VAR NAME="barcode" --></td>
                        <td><!-- TMPL_VAR NAME="holdingbranch" --></td>
-                       <td><input type="checkbox" name="renew_item_<!-- 
TMPL_VAR NAME="itemnumber" -->" value="y"<!-- TMPL_IF NAME="od" --> 
checked="checked"<!-- /TMPL_IF --> /></td>
+                       <td><input type="checkbox" name="renew_item_<!-- 
TMPL_VAR NAME="itemnumber" -->" value="y" <!-- TMPL_IF name="renewstatus" --> 
<!-- TMPL_IF name="od" -->checked="checked"<!-- /TMPL_IF -->  <!-- TMPL_ELSE 
-->disabled <!--/TMPL_IF--> /></td>
 <!-- HIDE FOR CCFLS
                        <td><a href="/cgi-bin/koha/circ/returns.pl?barcode=<!-- 
TMPL_VAR name="barcode" -->">Return</a></td>
 END HIDE FOR CCFLS -->

Index: koha-tmpl/intranet-tmpl/npl/en/circ/circulation.tmpl
===================================================================
RCS file: 
/sources/koha/koha/koha-tmpl/intranet-tmpl/npl/en/circ/Attic/circulation.tmpl,v
retrieving revision 1.6.2.17.2.11
retrieving revision 1.6.2.17.2.12
diff -u -b -r1.6.2.17.2.11 -r1.6.2.17.2.12
--- koha-tmpl/intranet-tmpl/npl/en/circ/circulation.tmpl        16 May 2007 
06:58:15 -0000      1.6.2.17.2.11
+++ koha-tmpl/intranet-tmpl/npl/en/circ/circulation.tmpl        1 Nov 2007 
13:43:27 -0000       1.6.2.17.2.12
@@ -322,7 +322,7 @@
                        <td><!-- TMPL_VAR NAME="author" --></td>
                        <td><!-- TMPL_VAR NAME="classification" --></td>
                        <td><!-- TMPL_VAR NAME="barcode" --></td>
-                       <td><input type="checkbox" name="renew_item_<!-- 
TMPL_VAR NAME="itemnumber" -->" value="y"<!-- TMPL_IF NAME="od" --> 
checked="checked"<!-- /TMPL_IF --> /></td>
+                       <td><input type="checkbox" name="renew_item_<!-- 
TMPL_VAR NAME="itemnumber" -->" value="y" <!-- TMPL_IF name="renewstatus" --> 
<!-- TMPL_IF name="od" -->checked="checked"<!-- /TMPL_IF -->  <!-- TMPL_ELSE 
-->disabled <!--/TMPL_IF--> /></td>
                        <td><a href="/cgi-bin/koha/circ/returns.pl?barcode=<!-- 
TMPL_VAR name="barcode" -->">Return</a></td>
                </tr>
                <!-- /TMPL_LOOP -->
@@ -337,7 +337,7 @@
                        <td><!-- TMPL_VAR NAME="author" --></td>
                        <td><!-- TMPL_VAR NAME="classification" --></td>
                        <td><!-- TMPL_VAR NAME="barcode" --></td>
-                       <td><input type="checkbox" name="renew_item_<!-- 
TMPL_VAR NAME="itemnumber" -->" value="y"<!-- TMPL_IF NAME="od" --> 
checked="checked"<!-- /TMPL_IF --> /></td>
+                       <td><input type="checkbox" name="renew_item_<!-- 
TMPL_VAR NAME="itemnumber" -->" value="y" <!-- TMPL_IF name="renewstatus" --> 
<!-- TMPL_IF name="od" -->checked="checked"<!-- /TMPL_IF -->  <!-- TMPL_ELSE 
-->disabled <!--/TMPL_IF--> /></td>
                        <td><a href="/cgi-bin/koha/circ/returns.pl?barcode=<!-- 
TMPL_VAR name="barcode" -->">Return</a></td></tr>
                <!-- /TMPL_LOOP -->
        </table>