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

(-)a/circ/circulation.pl (-3 / +3 lines)
Lines 704-710 $template->param( Link Here
704
    soundon           => C4::Context->preference("SoundOn"),
704
    soundon           => C4::Context->preference("SoundOn"),
705
    fast_cataloging   => $fast_cataloging,
705
    fast_cataloging   => $fast_cataloging,
706
    CircAutoPrintQuickSlip   => C4::Context->preference("CircAutoPrintQuickSlip"),
706
    CircAutoPrintQuickSlip   => C4::Context->preference("CircAutoPrintQuickSlip"),
707
	activeBorrowerRelationship => (C4::Context->preference('borrowerRelationship') ne ''),
707
    activeBorrowerRelationship => (C4::Context->preference('borrowerRelationship') ne ''),
708
    SuspendHoldsIntranet => C4::Context->preference('SuspendHoldsIntranet'),
709
    AutoResumeSuspendedHolds => C4::Context->preference('AutoResumeSuspendedHolds'),
708
);
710
);
709
711
710
# save stickyduedate to session
712
# save stickyduedate to session
Lines 729-734 $template->param( Link Here
729
    canned_bor_notes_loop     => $canned_notes,
731
    canned_bor_notes_loop     => $canned_notes,
730
);
732
);
731
733
732
$template->param( AutoResumeSuspendedHolds => C4::Context->preference('AutoResumeSuspendedHolds') );
733
734
output_html_with_http_headers $query, $cookie, $template->output;
734
output_html_with_http_headers $query, $cookie, $template->output;
(-)a/installer/data/mysql/sysprefs.sql (+2 lines)
Lines 363-365 INSERT INTO systempreferences (variable,value,options,explanation,type) VALUES ( Link Here
363
INSERT INTO systempreferences (variable,value,explanation,options,type) VALUES ('OpacStarRatings','all',NULL,'disable|all|details','Choice');
363
INSERT INTO systempreferences (variable,value,explanation,options,type) VALUES ('OpacStarRatings','all',NULL,'disable|all|details','Choice');
364
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');
364
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('SvcMaxReportRows','10','Maximum number of rows to return via the report web service.',NULL,'Integer');
365
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('SuspendHoldsIntranet', '1', NULL , 'Allow holds to be suspended from the intranet.', 'YesNo');
367
INSERT INTO systempreferences (variable,value,explanation,options,type) VALUES('SuspendHoldsOpac', '1', NULL , 'Allow holds to be suspended from the OPAC.', 'YesNo');
(-)a/installer/data/mysql/updatedatabase.pl (+8 lines)
Lines 5239-5244 if ( C4::Context->preference("Version") < TransformToNum($DBversion) ) { Link Here
5239
    SetVersion($DBversion);
5239
    SetVersion($DBversion);
5240
}
5240
}
5241
5241
5242
$DBversion = "3.09.00.XXX";
5243
if ( C4::Context->preference("Version") < TransformToNum($DBversion) ) {
5244
    $dbh->do("INSERT INTO systempreferences (variable,value,explanation,options,type) VALUES('SuspendHoldsIntranet', '1', NULL , 'Allow holds to be suspended from the intranet.', 'YesNo')");
5245
    $dbh->do("INSERT INTO systempreferences (variable,value,explanation,options,type) VALUES('SuspendHoldsOpac', '1', NULL , 'Allow holds to be suspended from the OPAC.', 'YesNo')");
5246
    print "Upgrade to $DBversion done (Add system preference OpacBrowseResults ))\n";
5247
    SetVersion($DBversion);
5248
}
5249
5242
=head1 FUNCTIONS
5250
=head1 FUNCTIONS
5243
5251
5244
=head2 TableExists($table)
5252
=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 989-994 No patron matched <span class="ex">[% message %]</span> Link Here
989
            <fieldset class="action"><input type="submit" class="cancel" name="submit" value="Cancel marked holds" /></fieldset>
989
            <fieldset class="action"><input type="submit" class="cancel" name="submit" value="Cancel marked holds" /></fieldset>
990
    </form>
990
    </form>
991
991
992
    [% IF SuspendHoldsIntranet %]
992
    <fieldset class="action">
993
    <fieldset class="action">
993
        <form action="/cgi-bin/koha/reserve/modrequest_suspendall.pl" method="post">
994
        <form action="/cgi-bin/koha/reserve/modrequest_suspendall.pl" method="post">
994
            <input type="hidden" name="from" value="circ" />
995
            <input type="hidden" name="from" value="circ" />
Lines 1040-1047 No patron matched <span class="ex">[% message %]</span> Link Here
1040
            <input type="submit" value="Resume all suspended holds" />
1041
            <input type="submit" value="Resume all suspended holds" />
1041
	</form>
1042
	</form>
1042
    </fieldset>
1043
    </fieldset>
1044
    [% END # IF SuspendHoldsIntranet %]
1043
1045
1044
	[% ELSE %]
1046
[% ELSE %]
1045
	<p>Patron has nothing on hold.</p>
1047
	<p>Patron has nothing on hold.</p>
1046
[% END %]
1048
[% END %]
1047
</div> <!-- reservesloop -->
1049
</div> <!-- reservesloop -->
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember.tt (+3 lines)
Lines 645-650 function validate1(date) { Link Here
645
645
646
        <fieldset class="action"><input type="submit" class="cancel" name="submit" value="Cancel marked holds" /></fieldset>
646
        <fieldset class="action"><input type="submit" class="cancel" name="submit" value="Cancel marked holds" /></fieldset>
647
    </form>
647
    </form>
648
649
    [% IF SuspendHoldsIntranet %]
648
    <fieldset class="action">
650
    <fieldset class="action">
649
        <form action="/cgi-bin/koha/reserve/modrequest_suspendall.pl" method="post">
651
        <form action="/cgi-bin/koha/reserve/modrequest_suspendall.pl" method="post">
650
            <input type="hidden" name="from" value="borrower" />
652
            <input type="hidden" name="from" value="borrower" />
Lines 696-701 function validate1(date) { Link Here
696
            <input type="submit" value="Resume all suspended holds" />
698
            <input type="submit" value="Resume all suspended holds" />
697
	</form>
699
	</form>
698
    </fieldset>
700
    </fieldset>
701
    [% END # IF SuspendHoldsIntranet %]
699
702
700
    [% ELSE %]<p>Patron has nothing on hold.</p>[% END %]
703
    [% ELSE %]<p>Patron has nothing on hold.</p>[% END %]
701
	</div>
704
	</div>
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/reserve/request.tt (-1 / +4 lines)
Lines 597-603 function checkMultiHold() { Link Here
597
            <th><img src="/intranet-tmpl/[% theme %]/img/go-bottom.png" border="0" alt="Toggle set to lowest priority" /></th>
597
            <th><img src="/intranet-tmpl/[% theme %]/img/go-bottom.png" border="0" alt="Toggle set to lowest priority" /></th>
598
        [% END %]
598
        [% END %]
599
	<th>&nbsp;</th>
599
	<th>&nbsp;</th>
600
	<th>&nbsp;</th>
600
	[% IF SuspendHoldsIntranet %]<th>&nbsp;</th><!-- Suspend Holds Column Header -->[% END %]
601
      </tr>
601
      </tr>
602
  [% FOREACH reserveloo IN biblioloo.reserveloop %]
602
  [% FOREACH reserveloo IN biblioloo.reserveloop %]
603
  [% UNLESS ( loop.odd ) %]<tr class="highlight">[% ELSE %]<tr>[% END %]
603
  [% UNLESS ( loop.odd ) %]<tr class="highlight">[% ELSE %]<tr>[% END %]
Lines 729-734 function checkMultiHold() { Link Here
729
                </a>
729
                </a>
730
	</td>
730
	</td>
731
731
732
        [% IF SuspendHoldsIntranet %]
732
	<td>
733
	<td>
733
	[% UNLESS ( reserveloo.wait ) %]
734
	[% UNLESS ( reserveloo.wait ) %]
734
            <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 %]'" />
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 %]'" />
Lines 767-772 function checkMultiHold() { Link Here
767
		<input type="hidden" name="suspend_until" value="" />
768
		<input type="hidden" name="suspend_until" value="" />
768
	[% END %]
769
	[% END %]
769
	</td>
770
	</td>
771
        [% END # IF SuspendHoldsIntranet %]
772
770
      </tr>
773
      </tr>
771
774
772
  [% END %] <!-- existing reserveloop -->
775
  [% END %] <!-- existing reserveloop -->
(-)a/koha-tmpl/opac-tmpl/prog/en/modules/opac-user.tt (+2 lines)
Lines 421-426 $.tablesorter.addParser({ Link Here
421
			</tbody>
421
			</tbody>
422
        </table>
422
        </table>
423
423
424
        [% IF SuspendHoldsOpac %]
424
	<div>
425
	<div>
425
            <form action="/cgi-bin/koha/opac-modrequest-suspend.pl" method="post">
426
            <form action="/cgi-bin/koha/opac-modrequest-suspend.pl" method="post">
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?');" />
427
              <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 472-477 $.tablesorter.addParser({ Link Here
472
              <input type="hidden" name="suspend" value="0" />
473
              <input type="hidden" name="suspend" value="0" />
473
            </form>
474
            </form>
474
	</div>
475
	</div>
476
        [% END %]
475
    </div>
477
    </div>
476
    [% END %]
478
    [% END %]
477
    </div><!-- /opac-user views -->
479
    </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 362-368 $template->param( Link Here
362
);
362
);
363
363
364
$template->param( DHTMLcalendar_dateformat  => C4::Dates->DHTMLcalendar() );
364
$template->param( DHTMLcalendar_dateformat  => C4::Dates->DHTMLcalendar() );
365
$template->param( AutoResumeSuspendedHolds => C4::Context->preference('AutoResumeSuspendedHolds') );
365
$template->param(
366
    SuspendHoldsOpac => C4::Context->preference('SuspendHoldsOpac'),
367
    AutoResumeSuspendedHolds => C4::Context->preference('AutoResumeSuspendedHolds') ,
368
);
366
369
367
output_html_with_http_headers $query, $cookie, $template->output;
370
output_html_with_http_headers $query, $cookie, $template->output;
368
371
(-)a/reserve/request.pl (-2 / +4 lines)
Lines 632-638 if ( C4::Context->preference( 'AllowHoldDateInFuture' ) ) { Link Here
632
    $template->param( reserve_in_future => 1 );
632
    $template->param( reserve_in_future => 1 );
633
}
633
}
634
634
635
$template->param( AutoResumeSuspendedHolds => C4::Context->preference('AutoResumeSuspendedHolds') );
635
$template->param(
636
    SuspendHoldsIntranet => C4::Context->preference('SuspendHoldsIntranet'),
637
    AutoResumeSuspendedHolds => C4::Context->preference('AutoResumeSuspendedHolds'),
638
);
636
639
637
# printout the page
640
# printout the page
638
output_html_with_http_headers $input, $cookie, $template->output;
641
output_html_with_http_headers $input, $cookie, $template->output;
639
- 

Return to bug 7951