View | Details | Raw Unified | Return to bug 21608
Collapse All | Expand All

(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/reserve/request.tt (-7 / +18 lines)
Lines 169-184 function checkMultiHold() { Link Here
169
    }).change(function() {
169
    }).change(function() {
170
        var row = $(this).parents("tr:first");
170
        var row = $(this).parents("tr:first");
171
        var value = parseInt($(this).val());
171
        var value = parseInt($(this).val());
172
        var after = row.parent().find("tr:nth-child("+(value+1)+")");
172
        var found_holds = $("select[name='rank-request'][disabled='disabled']").length ; //Count how many are found
173
173
174
        if (prev_rank_request > value) {
174
        if( !isNaN(value) ) {  //If moved to 'del'
175
            row.insertBefore(after);
175
            var after = row.parent().find("tr:nth-child("+(value+1+found_holds)+")");
176
        } else {
176
            //Go to the row 1 after the new value (and skip found holds)
177
            row.insertAfter(after);
177
            if (prev_rank_request > value) {
178
                row.insertBefore(after);
179
            } else {
180
                row.insertAfter(after);
181
            }
178
        }
182
        }
179
183
180
        var next_priority = 1;
184
        var next_priority = 1;
181
        $("select[name=rank-request]").each(function () {
185
        $("select[name=rank-request]").each(function () {
186
            if( isNaN( $(this).val() ) ){ return true; } //Don't reset found or del holds
182
            $(this).val(next_priority);
187
            $(this).val(next_priority);
183
            next_priority++;
188
            next_priority++;
184
        });
189
        });
Lines 757-763 function checkMultiHold() { Link Here
757
          <input type="hidden" name="reserve_id" value="[% reserveloo.reserve_id %]" />
762
          <input type="hidden" name="reserve_id" value="[% reserveloo.reserve_id %]" />
758
          <input type="hidden" name="borrowernumber" value="[% reserveloo.borrowernumber %]" />
763
          <input type="hidden" name="borrowernumber" value="[% reserveloo.borrowernumber %]" />
759
          <input type="hidden" name="biblionumber" value="[% reserveloo.biblionumber %]" />
764
          <input type="hidden" name="biblionumber" value="[% reserveloo.biblionumber %]" />
760
          <select name="rank-request">
765
          [% IF !reserveloo.found %]
766
              <select name="rank-request">
767
          [% ELSE %]
768
              <input type="hidden" name="rank-request" value="[% reserveloo.priority | html %]">
769
              <select name="rank-request" disabled="disabled">
770
          [% END %]
761
              [% IF ( reserveloo.found ) %]
771
              [% IF ( reserveloo.found ) %]
762
                  [% IF ( reserveloo.intransit ) %]
772
                  [% IF ( reserveloo.intransit ) %]
763
                      <option value="T" selected="selected">In transit</option>
773
                      <option value="T" selected="selected">In transit</option>
Lines 892-897 function checkMultiHold() { Link Here
892
                <input type="hidden" name="suspend_until" id="suspend_until_[% reserveloo.reserve_id %]" value=""/>
902
                <input type="hidden" name="suspend_until" id="suspend_until_[% reserveloo.reserve_id %]" value=""/>
893
            [% END %]
903
            [% END %]
894
	[% ELSE %]
904
	[% ELSE %]
905
    <input type="button" id="revert_hold_[% hold.reserve_id | html %]" value="[% IF reserveloo.intransit %]Revert transit status[% ELSE %]Revert waiting status[% END %]" onclick="window.location.href='request.pl?action=move&amp;&amp;was_found=1&amp;borrowernumber=[% reserveloo.borrowernumber | uri %]&amp;biblionumber=[% reserveloo.biblionumber | uri %]&amp;itemnumber=[% reserveloo.itemnumber | uri %]&amp;reserve_id=[% reserveloo.reserve_id | uri %]&amp;date=[% reserveloo.date | uri %]'">
895
		<input type="hidden" name="suspend_until" value="" />
906
		<input type="hidden" name="suspend_until" value="" />
896
	[% END %]
907
	[% END %]
897
	</td>
908
	</td>
(-)a/reserve/request.pl (-2 / +7 lines)
Lines 87-94 $action ||= q{}; Link Here
87
87
88
if ( $action eq 'move' ) {
88
if ( $action eq 'move' ) {
89
  my $where = $input->param('where');
89
  my $where = $input->param('where');
90
  my $was_found = $input->param("was_found");
90
  my $reserve_id = $input->param('reserve_id');
91
  my $reserve_id = $input->param('reserve_id');
91
  AlterPriority( $where, $reserve_id );
92
  my $hold_itemnumber = $input->param('itemnumber');
93
  if ( $was_found ){
94
      C4::Reserves::RevertWaitingStatus({ itemnumber => $hold_itemnumber });
95
  } else {
96
    AlterPriority( $where, $reserve_id );
97
  }
92
} elsif ( $action eq 'cancel' ) {
98
} elsif ( $action eq 'cancel' ) {
93
  my $reserve_id = $input->param('reserve_id');
99
  my $reserve_id = $input->param('reserve_id');
94
  my $hold = Koha::Holds->find( $reserve_id );
100
  my $hold = Koha::Holds->find( $reserve_id );
95
- 

Return to bug 21608