X-Git-Url: http://git.rot13.org/?a=blobdiff_plain;f=reserve%2Fmodrequest.pl;h=2f0b8d3f28699131d15f0ac8c07a318bed0b024f;hb=a794ce5a7696542dfe10551c0ccb57a948486db5;hp=3b6662388643feefc8921c806c19bae9deacdf69;hpb=47690dbcc440612a18ca2b870b3045e308915f5c;p=koha.git

diff --git a/reserve/modrequest.pl b/reserve/modrequest.pl
index 3b66623886..2f0b8d3f28 100755
--- a/reserve/modrequest.pl
+++ b/reserve/modrequest.pl
@@ -18,9 +18,9 @@
 # WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
 # A PARTICULAR PURPOSE.  See the GNU General Public License for more details.
 #
-# You should have received a copy of the GNU General Public License along with
-# Koha; if not, write to the Free Software Foundation, Inc., 59 Temple Place,
-# Suite 330, Boston, MA  02111-1307 USA
+# You should have received a copy of the GNU General Public License along
+# with Koha; if not, write to the Free Software Foundation, Inc.,
+# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 
 use strict;
 use warnings;
@@ -41,22 +41,24 @@ my ( $template, $loggedinuser, $cookie ) = get_template_and_user(
     }
 );
 
-my @rank=$query->param('rank-request');
-my @biblionumber=$query->param('biblionumber');
-my @borrower=$query->param('borrowernumber');
-my @branch=$query->param('pickup');
-my @itemnumber=$query->param('itemnumber');
+my @reserve_id = $query->param('reserve_id');
+my @rank = $query->param('rank-request');
+my @biblionumber = $query->param('biblionumber');
+my @borrower = $query->param('borrowernumber');
+my @branch = $query->param('pickup');
+my @itemnumber = $query->param('itemnumber');
+my @suspend_until=$query->param('suspend_until');
 my $multi_hold = $query->param('multi_hold');
 my $biblionumbers = $query->param('biblionumbers');
 my $count=@rank;
 
-my $CancelBiblioNumber=$query->param('CancelBiblioNumber');
-my $CancelBorrowerNumber=$query->param('CancelBorrowerNumber');
-my $CancelItemnumber=$query->param('CancelItemnumber');
+my $CancelBiblioNumber = $query->param('CancelBiblioNumber');
+my $CancelBorrowerNumber = $query->param('CancelBorrowerNumber');
+my $CancelItemnumber = $query->param('CancelItemnumber');
 
 # 2 possibilitys : cancel an item reservation, or modify or cancel the queded list
 
-# 1) cancel an item reservation by fonction ModReserveCancelAll (in reserves.pm)
+# 1) cancel an item reservation by function ModReserveCancelAll (in reserves.pm)
 if ($CancelBorrowerNumber) {
     ModReserveCancelAll($CancelItemnumber, $CancelBorrowerNumber);
     $biblionumber[0] = $CancelBiblioNumber,
@@ -66,13 +68,23 @@ if ($CancelBorrowerNumber) {
 else {
     for (my $i=0;$i<$count;$i++){
         undef $itemnumber[$i] unless $itemnumber[$i] ne '';
-        ModReserve($rank[$i],$biblionumber[$i],$borrower[$i],$branch[$i],$itemnumber[$i]); #from C4::Reserves
+        ModReserve({
+            rank => $rank[$i],
+            reserve_id => $reserve_id[$i],
+            branchcode => $branch[$i],
+            itemnumber => $itemnumber[$i],
+            suspend_until => $suspend_until[$i]
+        });
     }
 }
+
 my $from=$query->param('from');
-if ($from eq 'borrower'){
-  print $query->redirect("/cgi-bin/koha/members/moremember.pl?borrowernumber=$borrower[0]");
- } else {
+$from ||= q{};
+if ( $from eq 'borrower'){
+    print $query->redirect("/cgi-bin/koha/members/moremember.pl?borrowernumber=$borrower[0]");
+} elsif ( $from eq 'circ'){
+    print $query->redirect("/cgi-bin/koha/circ/circulation.pl?borrowernumber=$borrower[0]");
+} else {
      my $url = "/cgi-bin/koha/reserve/request.pl?";
      if ($multi_hold) {
          $url .= "multi_hold=1&biblionumbers=$biblionumbers";