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

(-)a/installer/data/mysql/sysprefs.sql (-1 / +1 lines)
Lines 187-193 INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES Link Here
187
INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES('OAI-PMH:archiveID','KOHA-OAI-TEST','OAI-PMH archive identification',NULL,'Free');
187
INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES('OAI-PMH:archiveID','KOHA-OAI-TEST','OAI-PMH archive identification',NULL,'Free');
188
INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES('OAI-PMH:MaxCount','50','OAI-PMH maximum number of records by answer to ListRecords and ListIdentifiers queries',NULL,'Integer');
188
INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES('OAI-PMH:MaxCount','50','OAI-PMH maximum number of records by answer to ListRecords and ListIdentifiers queries',NULL,'Integer');
189
INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES('OAI-PMH:ConfFile','','If empty, Koha OAI Server operates in normal mode, otherwise it operates in extended mode.',NULL,'File');
189
INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES('OAI-PMH:ConfFile','','If empty, Koha OAI Server operates in normal mode, otherwise it operates in extended mode.',NULL,'File');
190
INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES('OPACItemHolds','yes','Allow OPAC users to place hold on specific items. If No, users can only request next available copy. If Yes, users can choose between next available and specific copy. If Force, users *must* choose a specific copy.','no|yes|force','Choice');
190
INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES('OPACItemHolds','allow','Allow OPAC users to place hold on specific items. If noallow, users can only request next available copy. If allow, users can choose between next available and specific copy. If force, users *must* choose a specific copy.','noallow|allow|force','Choice');
191
191
192
INSERT INTO `systempreferences` (variable, value,options,type, explanation) VALUES ('AddPatronLists','categorycode','categorycode|category_type','Choice','Allow user to choose what list to pick up from when adding patrons');
192
INSERT INTO `systempreferences` (variable, value,options,type, explanation) VALUES ('AddPatronLists','categorycode','categorycode|category_type','Choice','Allow user to choose what list to pick up from when adding patrons');
193
INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES('ExtendedPatronAttributes','0','Use extended patron IDs and attributes',NULL,'YesNo');
193
INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES('ExtendedPatronAttributes','0','Use extended patron IDs and attributes',NULL,'YesNo');
(-)a/installer/data/mysql/updatedatabase.pl (-1 / +1 lines)
Lines 6013-6019 if (C4::Context->preference("Version") < TransformToNum($DBversion)) { Link Here
6013
6013
6014
$DBversion = "3.09.00.XXX";
6014
$DBversion = "3.09.00.XXX";
6015
if ( C4::Context->preference("Version") < TransformToNum($DBversion) ) {
6015
if ( C4::Context->preference("Version") < TransformToNum($DBversion) ) {
6016
    $dbh->do("UPDATE systempreferences SET type = 'Choice', options = 'no|yes|force', value = CASE value WHEN '1' THEN 'yes' ELSE  'no' END, explanation = 'Allow OPAC users to place hold on specific items. If No, users can only request next available copy. If Yes, users can choose between next available and specific copy. If Force, users *must* choose a specific copy.' WHERE variable = 'OPACItemHolds'");
6016
    $dbh->do("UPDATE systempreferences SET type = 'Choice', options = 'noallow|allow|force', value = CASE value WHEN '1' THEN 'allow' ELSE  'noallow' END, explanation = 'Allow OPAC users to place hold on specific items. If noallow, users can only request next available copy. If allow, users can choose between next available and specific copy. If force, users *must* choose a specific copy.' WHERE variable = 'OPACItemHolds'");
6017
    print "Upgrade to $DBversion done (Changed OPACItemHolds syspref to Choice)\n";
6017
    print "Upgrade to $DBversion done (Changed OPACItemHolds syspref to Choice)\n";
6018
    SetVersion($DBversion);
6018
    SetVersion($DBversion);
6019
}
6019
}
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/opac.pref (-2 / +2 lines)
Lines 403-410 OPAC: Link Here
403
        -
403
        -
404
            - pref: OPACItemHolds
404
            - pref: OPACItemHolds
405
              choices:
405
              choices:
406
                  no: "Don't allow"
406
                  noallow: "Don't allow"
407
                  yes: Allow
407
                  allow: Allow
408
                  force: Force
408
                  force: Force
409
            - patrons to place holds on specific items in the OPAC. If this is disabled, users can only put a hold on the next available item. If this is forced, users must put a hold on a specific item.
409
            - patrons to place holds on specific items in the OPAC. If this is disabled, users can only put a hold on the next available item. If this is forced, users must put a hold on a specific item.
410
        -
410
        -
(-)a/koha-tmpl/opac-tmpl/prog/en/modules/opac-reserve.tt (-6 / +5 lines)
Lines 30-36 Link Here
30
    $(".copiesrow").hide();
30
    $(".copiesrow").hide();
31
31
32
    $("#place_on_hdr").show();
32
    $("#place_on_hdr").show();
33
    [% IF OPACItemHolds == 'yes' %]
33
    [% IF OPACItemHolds == 'allow' %]
34
        $(".place_on_type").show();
34
        $(".place_on_type").show();
35
    [% END %]
35
    [% END %]
36
36
Lines 253-259 Link Here
253
        <th>Hold starts on date</th>
253
        <th>Hold starts on date</th>
254
		  [% END %]
254
		  [% END %]
255
        <th>Hold not needed after</th>
255
        <th>Hold not needed after</th>
256
                  [% IF OPACItemHolds == 'yes' %]
256
                  [% IF OPACItemHolds == 'allow' %]
257
                    <th id="place_on_hdr" style="display:none">Place On</th>
257
                    <th id="place_on_hdr" style="display:none">Place On</th>
258
                  [% END %]
258
                  [% END %]
259
                  [% UNLESS ( singleBranchMode ) %]
259
                  [% UNLESS ( singleBranchMode ) %]
Lines 337-343 Link Here
337
337
338
                    [% IF ( bibitemloo.holdable ) %]
338
                    [% IF ( bibitemloo.holdable ) %]
339
		    <!-- HOLDABLE -->
339
		    <!-- HOLDABLE -->
340
		        [% IF OPACItemHolds == 'yes' or OPACItemHolds == 'force' %]
340
		        [% IF OPACItemHolds == 'allow' or OPACItemHolds == 'force' %]
341
		        <!-- ITEM HOLDS -->
341
		        <!-- ITEM HOLDS -->
342
                                          <td class="place_on_type" style="display:none">
342
                                          <td class="place_on_type" style="display:none">
343
                                            <ul>
343
                                            <ul>
Lines 346-352 Link Here
346
                                                           id="reqany_[% bibitemloo.biblionumber %]"
346
                                                           id="reqany_[% bibitemloo.biblionumber %]"
347
                                                           class="selectany"
347
                                                           class="selectany"
348
                                                           value="Any"
348
                                                           value="Any"
349
                                                           [% IF OPACItemHolds == "yes" %]checked="checked"[% END %]
349
                                                           [% IF OPACItemHolds == "allow" %]checked="checked"[% END %]
350
                                                    />
350
                                                    />
351
                                                    <label for="reqany_[% bibitemloo.biblionumber %]">Next available copy</label>
351
                                                    <label for="reqany_[% bibitemloo.biblionumber %]">Next available copy</label>
352
                                                </li>
352
                                                </li>
Lines 402-408 Link Here
402
                    [% END %]
402
                    [% END %]
403
                  </tr>
403
                  </tr>
404
404
405
                  [% IF OPACItemHolds == 'yes' || OPACItemHolds == 'force' %]
405
                  [% IF OPACItemHolds == 'allow' || OPACItemHolds == 'force' %]
406
                  [% IF ( bibitemloo.holdable ) %]
406
                  [% IF ( bibitemloo.holdable ) %]
407
                    <tr class="copiesrow" id="copiesrow_[% bibitemloo.biblionumber %]">
407
                    <tr class="copiesrow" id="copiesrow_[% bibitemloo.biblionumber %]">
408
                      <td>&nbsp;</td>
408
                      <td>&nbsp;</td>
409
- 

Return to bug 7825