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

(-)a/circ/circulation.pl (-3 / +3 lines)
Lines 708-714 $template->param( Link Here
708
    soundon           => C4::Context->preference("SoundOn"),
708
    soundon           => C4::Context->preference("SoundOn"),
709
    fast_cataloging   => $fast_cataloging,
709
    fast_cataloging   => $fast_cataloging,
710
    CircAutoPrintQuickSlip   => C4::Context->preference("CircAutoPrintQuickSlip"),
710
    CircAutoPrintQuickSlip   => C4::Context->preference("CircAutoPrintQuickSlip"),
711
	activeBorrowerRelationship => (C4::Context->preference('borrowerRelationship') ne ''),
711
    activeBorrowerRelationship => (C4::Context->preference('borrowerRelationship') ne ''),
712
    SuspendHoldsIntranet => C4::Context->preference('SuspendHoldsIntranet'),
713
    AutoResumeSuspendedHolds => C4::Context->preference('AutoResumeSuspendedHolds'),
712
);
714
);
713
715
714
# save stickyduedate to session
716
# save stickyduedate to session
Lines 733-738 $template->param( Link Here
733
    canned_bor_notes_loop     => $canned_notes,
735
    canned_bor_notes_loop     => $canned_notes,
734
);
736
);
735
737
736
$template->param( AutoResumeSuspendedHolds => C4::Context->preference('AutoResumeSuspendedHolds') );
737
738
output_html_with_http_headers $query, $cookie, $template->output;
738
output_html_with_http_headers $query, $cookie, $template->output;
(-)a/installer/data/mysql/sysprefs.sql (+3 lines)
Lines 365-367 INSERT INTO systempreferences (variable,value,explanation,options,type) VALUES ( Link Here
365
INSERT INTO systempreferences (variable,value,explanation,options,type) VALUES('OpacBrowseResults','1','Disable/enable browsing and paging search results from the OPAC detail page.',NULL,'YesNo');
365
INSERT INTO systempreferences (variable,value,explanation,options,type) VALUES('OpacBrowseResults','1','Disable/enable browsing and paging search results from the OPAC detail page.',NULL,'YesNo');
366
INSERT INTO systempreferences (variable,value,explanation,options,type) VALUES('SvcMaxReportRows','10','Maximum number of rows to return via the report web service.',NULL,'Integer');
366
INSERT INTO systempreferences (variable,value,explanation,options,type) VALUES('SvcMaxReportRows','10','Maximum number of rows to return via the report web service.',NULL,'Integer');
367
INSERT INTO systempreferences (variable,value,options,explanation,type) VALUES ('ReservesControlBranch','PatronLibrary','ItemHomeLibrary|PatronLibrary','Branch checked for members reservations rights','Choice');
367
INSERT INTO systempreferences (variable,value,options,explanation,type) VALUES ('ReservesControlBranch','PatronLibrary','ItemHomeLibrary|PatronLibrary','Branch checked for members reservations rights','Choice');
368
INSERT INTO systempreferences (variable,value,explanation,options,type) VALUES('SuspendHoldsIntranet', '1', NULL , 'Allow holds to be suspended from the intranet.', 'YesNo');
369
INSERT INTO systempreferences (variable,value,explanation,options,type) VALUES('SuspendHoldsOpac', '1', NULL , 'Allow holds to be suspended from the OPAC.', 'YesNo');
370
(-)a/installer/data/mysql/updatedatabase.pl (+8 lines)
Lines 5307-5312 if (C4::Context->preference("Version") < TransformToNum($DBversion)) { Link Here
5307
    SetVersion ($DBversion);
5307
    SetVersion ($DBversion);
5308
}
5308
}
5309
5309
5310
$DBversion = "3.09.00.XXX";
5311
if ( C4::Context->preference("Version") < TransformToNum($DBversion) ) {
5312
    $dbh->do("INSERT INTO systempreferences (variable,value,explanation,options,type) VALUES('SuspendHoldsIntranet', '1', NULL , 'Allow holds to be suspended from the intranet.', 'YesNo')");
5313
    $dbh->do("INSERT INTO systempreferences (variable,value,explanation,options,type) VALUES('SuspendHoldsOpac', '1', NULL , 'Allow holds to be suspended from the OPAC.', 'YesNo')");
5314
    print "Upgrade to $DBversion done (Add system preference OpacBrowseResults ))\n";
5315
    SetVersion($DBversion);
5316
}
5317
5310
=head1 FUNCTIONS
5318
=head1 FUNCTIONS
5311
5319
5312
=head2 TableExists($table)
5320
=head2 TableExists($table)
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/circulation.pref (+12 lines)
Lines 350-355 Circulation: Link Here
350
                  yes: Allow
350
                  yes: Allow
351
                  no: "Don't allow"
351
                  no: "Don't allow"
352
            - suspended holds to be automatically resumed by a set date.
352
            - suspended holds to be automatically resumed by a set date.
353
        -
354
            - pref: SuspendHoldsIntranet
355
              choices:
356
                  yes: Allow
357
                  no: "Don't allow"
358
            - holds to be suspended from the intranet.
359
        -
360
            - pref: SuspendHoldsOpac
361
              choices:
362
                  yes: Allow
363
                  no: "Don't allow"
364
            - holds to be suspended from the OPAC.
353
    Fines Policy:
365
    Fines Policy:
354
        -
366
        -
355
            - Calculate fines based on days overdue
367
            - Calculate fines based on days overdue
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tt (-1 / +3 lines)
Lines 990-995 No patron matched <span class="ex">[% message %]</span> Link Here
990
            <fieldset class="action"><input type="submit" class="cancel" name="submit" value="Cancel marked holds" /></fieldset>
990
            <fieldset class="action"><input type="submit" class="cancel" name="submit" value="Cancel marked holds" /></fieldset>
991
    </form>
991
    </form>
992
992
993
    [% IF SuspendHoldsIntranet %]
993
    <fieldset class="action">
994
    <fieldset class="action">
994
        <form action="/cgi-bin/koha/reserve/modrequest_suspendall.pl" method="post">
995
        <form action="/cgi-bin/koha/reserve/modrequest_suspendall.pl" method="post">
995
            <input type="hidden" name="from" value="circ" />
996
            <input type="hidden" name="from" value="circ" />
Lines 1041-1048 No patron matched <span class="ex">[% message %]</span> Link Here
1041
            <input type="submit" value="Resume all suspended holds" />
1042
            <input type="submit" value="Resume all suspended holds" />
1042
	</form>
1043
	</form>
1043
    </fieldset>
1044
    </fieldset>
1045
    [% END # IF SuspendHoldsIntranet %]
1044
1046
1045
	[% ELSE %]
1047
[% ELSE %]
1046
	<p>Patron has nothing on hold.</p>
1048
	<p>Patron has nothing on hold.</p>
1047
[% END %]
1049
[% END %]
1048
</div> <!-- reservesloop -->
1050
</div> <!-- reservesloop -->
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember.tt (+3 lines)
Lines 646-651 function validate1(date) { Link Here
646
646
647
        <fieldset class="action"><input type="submit" class="cancel" name="submit" value="Cancel marked holds" /></fieldset>
647
        <fieldset class="action"><input type="submit" class="cancel" name="submit" value="Cancel marked holds" /></fieldset>
648
    </form>
648
    </form>
649
650
    [% IF SuspendHoldsIntranet %]
649
    <fieldset class="action">
651
    <fieldset class="action">
650
        <form action="/cgi-bin/koha/reserve/modrequest_suspendall.pl" method="post">
652
        <form action="/cgi-bin/koha/reserve/modrequest_suspendall.pl" method="post">
651
            <input type="hidden" name="from" value="borrower" />
653
            <input type="hidden" name="from" value="borrower" />
Lines 697-702 function validate1(date) { Link Here
697
            <input type="submit" value="Resume all suspended holds" />
699
            <input type="submit" value="Resume all suspended holds" />
698
	</form>
700
	</form>
699
    </fieldset>
701
    </fieldset>
702
    [% END # IF SuspendHoldsIntranet %]
700
703
701
    [% ELSE %]<p>Patron has nothing on hold.</p>[% END %]
704
    [% ELSE %]<p>Patron has nothing on hold.</p>[% END %]
702
	</div>
705
	</div>
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/reserve/request.tt (-1 / +4 lines)
Lines 598-604 function checkMultiHold() { Link Here
598
            <th><img src="/intranet-tmpl/[% theme %]/img/go-bottom.png" border="0" alt="Toggle set to lowest priority" /></th>
598
            <th><img src="/intranet-tmpl/[% theme %]/img/go-bottom.png" border="0" alt="Toggle set to lowest priority" /></th>
599
        [% END %]
599
        [% END %]
600
	<th>&nbsp;</th>
600
	<th>&nbsp;</th>
601
	<th>&nbsp;</th>
601
	[% IF SuspendHoldsIntranet %]<th>&nbsp;</th><!-- Suspend Holds Column Header -->[% END %]
602
      </tr>
602
      </tr>
603
  [% FOREACH reserveloo IN biblioloo.reserveloop %]
603
  [% FOREACH reserveloo IN biblioloo.reserveloop %]
604
  [% UNLESS ( loop.odd ) %]<tr class="highlight">[% ELSE %]<tr>[% END %]
604
  [% UNLESS ( loop.odd ) %]<tr class="highlight">[% ELSE %]<tr>[% END %]
Lines 730-735 function checkMultiHold() { Link Here
730
                </a>
730
                </a>
731
	</td>
731
	</td>
732
732
733
        [% IF SuspendHoldsIntranet %]
733
	<td>
734
	<td>
734
	[% UNLESS ( reserveloo.wait ) %]
735
	[% UNLESS ( reserveloo.wait ) %]
735
            <input type="button" value="[% IF ( reserveloo.suspend ) %]Unsuspend[% ELSE %]Suspend[% END %]" onclick="window.location.href='request.pl?action=toggleSuspend&amp;borrowernumber=[% reserveloo.borrowernumber %]&amp;biblionumber=[% reserveloo.biblionumber %]&amp;date=[% reserveloo.date %]&amp;suspend_until=' + $('#suspend_until_[% reserveloo.borrowernumber %]').val()" />
736
            <input type="button" value="[% IF ( reserveloo.suspend ) %]Unsuspend[% ELSE %]Suspend[% END %]" onclick="window.location.href='request.pl?action=toggleSuspend&amp;borrowernumber=[% reserveloo.borrowernumber %]&amp;biblionumber=[% reserveloo.biblionumber %]&amp;date=[% reserveloo.date %]&amp;suspend_until=' + $('#suspend_until_[% reserveloo.borrowernumber %]').val()" />
Lines 768-773 function checkMultiHold() { Link Here
768
		<input type="hidden" name="suspend_until" value="" />
769
		<input type="hidden" name="suspend_until" value="" />
769
	[% END %]
770
	[% END %]
770
	</td>
771
	</td>
772
        [% END # IF SuspendHoldsIntranet %]
773
771
      </tr>
774
      </tr>
772
775
773
  [% END %] <!-- existing reserveloop -->
776
  [% END %] <!-- existing reserveloop -->
(-)a/koha-tmpl/opac-tmpl/prog/en/modules/opac-user.tt (+2 lines)
Lines 420-425 $.tablesorter.addParser({ Link Here
420
			</tbody>
420
			</tbody>
421
        </table>
421
        </table>
422
422
423
        [% IF SuspendHoldsOpac %]
423
	<div>
424
	<div>
424
            <form action="/cgi-bin/koha/opac-modrequest-suspend.pl" method="post">
425
            <form action="/cgi-bin/koha/opac-modrequest-suspend.pl" method="post">
425
              <input type="submit" name="submit" class="icon delete cancel" value="Suspend all holds" onclick="return confirmDelete('Are you sure you want to suspend all holds?');" />
426
              <input type="submit" name="submit" class="icon delete cancel" value="Suspend all holds" onclick="return confirmDelete('Are you sure you want to suspend all holds?');" />
Lines 471-476 $.tablesorter.addParser({ Link Here
471
              <input type="hidden" name="suspend" value="0" />
472
              <input type="hidden" name="suspend" value="0" />
472
            </form>
473
            </form>
473
	</div>
474
	</div>
475
        [% END %]
474
    </div>
476
    </div>
475
    [% END %]
477
    [% END %]
476
    </div><!-- /opac-user views -->
478
    </div><!-- /opac-user views -->
(-)a/members/moremember.pl (-1 / +3 lines)
Lines 430-436 $template->param( Link Here
430
    samebranch     => $samebranch,
430
    samebranch     => $samebranch,
431
    quickslip		  => $quickslip,
431
    quickslip		  => $quickslip,
432
    activeBorrowerRelationship => (C4::Context->preference('borrowerRelationship') ne ''),
432
    activeBorrowerRelationship => (C4::Context->preference('borrowerRelationship') ne ''),
433
    AutoResumeSuspendedHolds => C4::Context->preference('AutoResumeSuspendedHolds') );
433
    AutoResumeSuspendedHolds => C4::Context->preference('AutoResumeSuspendedHolds'),
434
    SuspendHoldsIntranet => C4::Context->preference('SuspendHoldsIntranet'),
435
);
434
436
435
output_html_with_http_headers $input, $cookie, $template->output;
437
output_html_with_http_headers $input, $cookie, $template->output;
436
438
(-)a/opac/opac-user.pl (-1 / +4 lines)
Lines 365-371 $template->param( Link Here
365
);
365
);
366
366
367
$template->param( DHTMLcalendar_dateformat  => C4::Dates->DHTMLcalendar() );
367
$template->param( DHTMLcalendar_dateformat  => C4::Dates->DHTMLcalendar() );
368
$template->param( AutoResumeSuspendedHolds => C4::Context->preference('AutoResumeSuspendedHolds') );
368
$template->param(
369
    SuspendHoldsOpac => C4::Context->preference('SuspendHoldsOpac'),
370
    AutoResumeSuspendedHolds => C4::Context->preference('AutoResumeSuspendedHolds') ,
371
);
369
372
370
output_html_with_http_headers $query, $cookie, $template->output;
373
output_html_with_http_headers $query, $cookie, $template->output;
371
374
(-)a/reserve/request.pl (-2 / +4 lines)
Lines 633-639 if ( C4::Context->preference( 'AllowHoldDateInFuture' ) ) { Link Here
633
    $template->param( reserve_in_future => 1 );
633
    $template->param( reserve_in_future => 1 );
634
}
634
}
635
635
636
$template->param( AutoResumeSuspendedHolds => C4::Context->preference('AutoResumeSuspendedHolds') );
636
$template->param(
637
    SuspendHoldsIntranet => C4::Context->preference('SuspendHoldsIntranet'),
638
    AutoResumeSuspendedHolds => C4::Context->preference('AutoResumeSuspendedHolds'),
639
);
637
640
638
# printout the page
641
# printout the page
639
output_html_with_http_headers $input, $cookie, $template->output;
642
output_html_with_http_headers $input, $cookie, $template->output;
640
- 

Return to bug 7951