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

(-)a/installer/data/mysql/sysprefs.sql (-1 / +1 lines)
Lines 425-429 INSERT INTO systempreferences (variable,value,options,explanation,type) VALUES ( Link Here
425
INSERT INTO systempreferences (variable,value,options,explanation,type) VALUES ('HighlightOwnItemsOnOPACWhich','PatronBranch','PatronBranch|OpacURLBranch','Decides which branch''s items to emphasize. If PatronBranch, emphasize the logged in user''s library''s items. If OpacURLBranch, highlight the items of the Apache var BRANCHCODE defined in Koha''s Apache configuration file.','Choice');
425
INSERT INTO systempreferences (variable,value,options,explanation,type) VALUES ('HighlightOwnItemsOnOPACWhich','PatronBranch','PatronBranch|OpacURLBranch','Decides which branch''s items to emphasize. If PatronBranch, emphasize the logged in user''s library''s items. If OpacURLBranch, highlight the items of the Apache var BRANCHCODE defined in Koha''s Apache configuration file.','Choice');
426
INSERT INTO systempreferences (variable,value,explanation,options,type) VALUES('UniqueItemFields', 'barcode', 'Space-separated list of fields that should be unique (used in acquisition module for item creation). Fields must be valid SQL column names of items table', '', 'Free');
426
INSERT INTO systempreferences (variable,value,explanation,options,type) VALUES('UniqueItemFields', 'barcode', 'Space-separated list of fields that should be unique (used in acquisition module for item creation). Fields must be valid SQL column names of items table', '', 'Free');
427
INSERT IGNORE INTO systempreferences (variable,value,explanation,options,type) VALUES('UseCourseReserves', '0', 'Enable the course reserves feature.', NULL, 'YesNo');
427
INSERT IGNORE INTO systempreferences (variable,value,explanation,options,type) VALUES('UseCourseReserves', '0', 'Enable the course reserves feature.', NULL, 'YesNo');
428
INSERT IGNORE INTO systempreferences (variable,value,explanation,options,type) VALUES('OpacShowHoldNotes',0,'Show hold notes on OPAC','','YesNo');
428
INSERT IGNORE INTO systempreferences (variable,value,explanation,options,type) VALUES('OpacHoldNotes',0,'Show hold notes on OPAC','','YesNo');
429
INSERT INTO systempreferences (variable,value,explanation,options,type) VALUES ('CalculateFinesOnReturn','1','Switch to control if overdue fines are calculated on return or not', '', 'YesNo');
429
INSERT INTO systempreferences (variable,value,explanation,options,type) VALUES ('CalculateFinesOnReturn','1','Switch to control if overdue fines are calculated on return or not', '', 'YesNo');
(-)a/installer/data/mysql/updatedatabase.pl (+7 lines)
Lines 6983-6988 INSERT INTO systempreferences (variable,value,explanation,options,type) VALUES ( Link Here
6983
    SetVersion($DBversion);
6983
    SetVersion($DBversion);
6984
}
6984
}
6985
6985
6986
$DBversion = "3.13.00.XXX";
6987
if ( CheckVersion($DBversion) ) {
6988
    $dbh->do("UPDATE systempreferences SET variable='OpacHoldNotes' WHERE variable='OpacShowHoldNotes'");
6989
    print "Upgrade to $DBversion done (Bug 10343: Rename OpacShowHoldNotes to OpacHoldNotes)\n";
6990
    SetVersion($DBversion);
6991
}
6992
6986
6993
6987
=head1 FUNCTIONS
6994
=head1 FUNCTIONS
6988
6995
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/opac.pref (-1 / +1 lines)
Lines 418-424 OPAC: Link Here
418
                no: Don't display
418
                no: Don't display
419
            - the list of authors/subjects in a popup for a combined search on OPAC detail pages.
419
            - the list of authors/subjects in a popup for a combined search on OPAC detail pages.
420
        -
420
        -
421
            - pref: OpacShowHoldNotes
421
            - pref: OpacHoldNotes
422
              default: 0
422
              default: 0
423
              choices:
423
              choices:
424
                  yes: Allow
424
                  yes: Allow
(-)a/koha-tmpl/opac-tmpl/prog/en/modules/opac-reserve.tt (-3 / +3 lines)
Lines 272-278 Link Here
272
        <th>Hold starts on date</th>
272
        <th>Hold starts on date</th>
273
		  [% END %]
273
		  [% END %]
274
        <th>Hold not needed after</th>
274
        <th>Hold not needed after</th>
275
        [% IF ( OPACShowHoldNotes ) %]<th>Notes</th>[% END %]
275
        [% IF ( OpacHoldNotes ) %]<th>Notes</th>[% END %]
276
                  [% IF ( OPACItemHolds ) %]
276
                  [% IF ( OPACItemHolds ) %]
277
                    <th id="place_on_hdr" style="display:none">Place on</th>
277
                    <th id="place_on_hdr" style="display:none">Place on</th>
278
                  [% END %]
278
                  [% END %]
Lines 359-365 Link Here
359
      <a href="#" style="font-size:85%;text-decoration:none;" onclick="document.getElementById('expiration_date_[% bibitemloo.biblionumber %]').value='';return false;">Clear date</a></p>
359
      <a href="#" style="font-size:85%;text-decoration:none;" onclick="document.getElementById('expiration_date_[% bibitemloo.biblionumber %]').value='';return false;">Clear date</a></p>
360
    </td>[% END %]
360
    </td>[% END %]
361
361
362
    [% IF ( OPACShowHoldNotes ) %][% IF ( bibitemloo.holdable ) %]<td><input type="button" id="shownotes_[% bibitemloo.biblionumber %]" class="shownotes" value="Edit notes"/></td>[% END %][% END %]
362
    [% IF ( OpacHoldNotes ) %][% IF ( bibitemloo.holdable ) %]<td><input type="button" id="shownotes_[% bibitemloo.biblionumber %]" class="shownotes" value="Edit notes"/></td>[% END %][% END %]
363
363
364
                    [% IF ( bibitemloo.holdable ) %]
364
                    [% IF ( bibitemloo.holdable ) %]
365
		    <!-- HOLD ABLE -->
365
		    <!-- HOLD ABLE -->
Lines 437-443 Link Here
437
                    [% END %]
437
                    [% END %]
438
                  </tr>
438
                  </tr>
439
439
440
                  [% IF ( OPACShowHoldNotes ) %]
440
                  [% IF ( OpacHoldNotes ) %]
441
                  [% IF ( bibitemloo.holdable ) %]
441
                  [% IF ( bibitemloo.holdable ) %]
442
                  <tr class="notesrow" id="notesrow_[% bibitemloo.biblionumber %]">
442
                  <tr class="notesrow" id="notesrow_[% bibitemloo.biblionumber %]">
443
                      <td>&nbsp;</td>
443
                      <td>&nbsp;</td>
(-)a/koha-tmpl/opac-tmpl/prog/en/modules/opac-user.tt (-2 / +2 lines)
Lines 359-365 $.tablesorter.addParser({ Link Here
359
            <thead><tr>
359
            <thead><tr>
360
                <th class="{sorter:'articles'}">Title</th>
360
                <th class="{sorter:'articles'}">Title</th>
361
                <th>Placed on</th>
361
                <th>Placed on</th>
362
                [% IF OpacShowHoldNotes %]<th>Notes</th>[% END %]
362
                [% IF OpacHoldNotes %]<th>Notes</th>[% END %]
363
        <th>Expires on</th>
363
        <th>Expires on</th>
364
                <th>Pick up location</th>
364
                <th>Pick up location</th>
365
		[% IF ( showpriority ) %]
365
		[% IF ( showpriority ) %]
Lines 387-393 $.tablesorter.addParser({ Link Here
387
                    [% RESERVE.author %]
387
                    [% RESERVE.author %]
388
                </td>
388
                </td>
389
                <td class="reservedate">[% RESERVE.reservedate | $KohaDates %]</td>
389
                <td class="reservedate">[% RESERVE.reservedate | $KohaDates %]</td>
390
                [% IF OpacShowHoldNotes %]<td class="reservenotes">[% RESERVE.reservenotes %]</td>[% END %]
390
                [% IF OpacHoldNotes %]<td class="reservenotes">[% RESERVE.reservenotes %]</td>[% END %]
391
        <td class="expirationdate">[% IF ( RESERVE.expirationdate ) %][% RESERVE.expirationdate | $KohaDates %][% ELSE %]Never expires[% END %]</td>
391
        <td class="expirationdate">[% IF ( RESERVE.expirationdate ) %][% RESERVE.expirationdate | $KohaDates %][% ELSE %]Never expires[% END %]</td>
392
                <td class="branch">[% RESERVE.branch %]</td>
392
                <td class="branch">[% RESERVE.branch %]</td>
393
				[% IF ( showpriority ) %]
393
				[% IF ( showpriority ) %]
(-)a/opac/opac-reserve.pl (-2 / +2 lines)
Lines 556-563 if (! $template->{VARS}->{'singleBranchMode'}) { Link Here
556
    $itemTableColspan--;
556
    $itemTableColspan--;
557
}
557
}
558
$itemTableColspan-- if !$show_holds_count && !$show_priority;
558
$itemTableColspan-- if !$show_holds_count && !$show_priority;
559
my $show_notes=C4::Context->preference('OPACShowHoldNotes');
559
my $show_notes=C4::Context->preference('OpacHoldNotes');
560
$template->param(OPACShowHoldNotes=>$show_notes);
560
$template->param(OpacHoldNotes=>$show_notes);
561
$itemTableColspan-- if !$show_notes;
561
$itemTableColspan-- if !$show_notes;
562
$template->param(itemtable_colspan => $itemTableColspan);
562
$template->param(itemtable_colspan => $itemTableColspan);
563
563
(-)a/opac/opac-user.pl (-2 / +1 lines)
Lines 364-370 $template->param( Link Here
364
$template->param(
364
$template->param(
365
    SuspendHoldsOpac => C4::Context->preference('SuspendHoldsOpac'),
365
    SuspendHoldsOpac => C4::Context->preference('SuspendHoldsOpac'),
366
    AutoResumeSuspendedHolds => C4::Context->preference('AutoResumeSuspendedHolds'),
366
    AutoResumeSuspendedHolds => C4::Context->preference('AutoResumeSuspendedHolds'),
367
    OpacShowHoldNotes => C4::Context->preference('OpacShowHoldNotes'),
367
    OpacHoldNotes => C4::Context->preference('OpacHoldNotes'),
368
);
368
);
369
369
370
output_html_with_http_headers $query, $cookie, $template->output;
370
output_html_with_http_headers $query, $cookie, $template->output;
371
- 

Return to bug 10343