better way of fixing "renew all"

Signed-off-by: Joshua Ferraro <jmf@liblime.com>

diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tmpl
index bb8ea3d..10e2952 100755 (executable)
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tmpl
@@ -406,6 +406,7 @@ No patron matched <span class="ex"><!-- TMPL_VAR name="message" --></span>
         <td><!-- TMPL_VAR NAME="barcode" --></td>
         <td>
                <!-- TMPL_IF NAME="can_renew" -->
+        <input type="checkbox" name="all_items[]" value="<!-- TMPL_VAR NAME="itemnumber" -->" checked="checked" style="display: none;" />
         <!-- TMPL_IF NAME="od" -->
             <input type="checkbox" name="items[]" value="<!-- TMPL_VAR NAME="itemnumber" -->" checked="checked" />
         <!-- TMPL_ELSE -->
@@ -419,7 +420,6 @@ No patron matched <span class="ex"><!-- TMPL_VAR name="message" --></span>
                            Too Many Renewals
                        <!-- /TMPL_IF -->
                <!-- /TMPL_IF -->
-        <input type="checkbox" name="all_items[]" value="<!-- TMPL_VAR NAME="itemnumber" -->" checked="checked" style="display: none;" />
         </td>
                <td><a href="/cgi-bin/koha/circ/returns.pl?barcode=<!-- TMPL_VAR NAME="barcode" -->">Check In</a></td>
                <!-- TMPL_IF NAME="renew_failed" -->
@@ -455,6 +455,7 @@ No patron matched <span class="ex"><!-- TMPL_VAR name="message" --></span>
         <td><!-- TMPL_VAR NAME="barcode" --></td>
         <td>
                <!-- TMPL_IF NAME="can_renew" -->
+            <input type="checkbox" name="all_items[]" value="<!-- TMPL_VAR NAME="itemnumber" -->" checked="checked" style="display: none;" />
         <!-- TMPL_IF NAME="od" -->
             <input type="checkbox" name="items[]" value="<!-- TMPL_VAR NAME="itemnumber" -->" checked="checked" />
         <!-- TMPL_ELSE -->
@@ -469,7 +470,6 @@ No patron matched <span class="ex"><!-- TMPL_VAR name="message" --></span>
                        <!-- /TMPL_IF -->
                        
                <!-- /TMPL_IF -->
-        <input type="checkbox" name="all_items[]" value="<!-- TMPL_VAR NAME="itemnumber" -->" checked="checked" style="display: none;" />
         </td>
                <td><a href="/cgi-bin/koha/circ/returns.pl?barcode=<!-- TMPL_VAR NAME="barcode" -->">Check In</a></td>
                <!-- TMPL_IF NAME="renew_failed" -->

diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember.tmpl
index 800ec47..1b16713 100644 (file)
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember.tmpl
@@ -376,6 +376,7 @@ for (var i=0;i<ItemsNodes.length;i++){
                                        Too Many Renewals
                                    <!-- /TMPL_IF -->
             <!-- TMPL_ELSE -->
+            <input type="checkbox" name="all_items[]" value="<!-- TMPL_VAR NAME="itemnumber" -->" checked="checked" style="display: none;" />
             <!-- TMPL_IF NAME="red" -->
             <input type="checkbox" name="items[]" value="<!-- TMPL_VAR NAME="itemnumber" -->" checked="checked" onClick="javascript:uncheck_sibling(this);" />
             <!-- TMPL_ELSE -->
@@ -387,7 +388,9 @@ for (var i=0;i<ItemsNodes.length;i++){
       <!-- TMPL_IF NAME="return_failed" -->
             <td class="problem">Return Failed</td>
        <!--TMPL_ELSE-->   
-            <td><input type="checkbox" name="barcodes[]"  value="<!-- TMPL_VAR NAME="barcode" -->" onClick="javascript:uncheck_sibling(this);" /></td>
+            <td><input type="checkbox" name="barcodes[]"  value="<!-- TMPL_VAR NAME="barcode" -->" onClick="javascript:uncheck_sibling(this);" />
+            <input type="checkbox" name="all_barcodes[]" value="<!-- TMPL_VAR NAME="barcode" -->" checked="checked" style="display: none;" />
+            </td>
       <!-- /TMPL_IF -->
         </tr>
         <!-- /tmpl_loop -->

diff --git a/reserve/renewscript.pl b/reserve/renewscript.pl
index daf8c2a..6e3cf14 100755 (executable)
--- a/reserve/renewscript.pl
+++ b/reserve/renewscript.pl
@@ -47,9 +47,21 @@ my ( $template, $loggedinuser, $cookie ) = get_template_and_user(
 # find items to renew, all items or a selection of items
 #
 
-my @data = $input->param('items[]');
+my @data;
+if ($input->param('renew_all')) {
+    @data = $input->param('all_items[]');
+}
+else {
+    @data = $input->param('items[]');
+}
+
+my @barcodes;
+if ($input->param('return_all')) {
+    @barcodes = $input->param('all_barcodes[]');
+} else {
+    @barcodes = $input->param('barcodes[]');
+}
 
-my @barcodes = $input->param('barcodes[]');
 my $branch=$input->param('branch');
 my $datedue;
 if ($input->param('newduedate')){