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

(-)a/installer/data/mysql/sysprefs.sql (-1 / +1 lines)
Lines 183-189 INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES Link Here
183
INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES('OAI-PMH:archiveID','KOHA-OAI-TEST','OAI-PMH archive identification',NULL,'Free');
183
INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES('OAI-PMH:archiveID','KOHA-OAI-TEST','OAI-PMH archive identification',NULL,'Free');
184
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');
184
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');
185
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');
185
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');
186
INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES('OPACItemHolds','1','Allow OPAC users to place hold on specific items. If OFF, users can only request next available copy.','','YesNo');
186
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');
187
187
188
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');
188
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');
189
INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES('ExtendedPatronAttributes','0','Use extended patron IDs and attributes',NULL,'YesNo');
189
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 (+8 lines)
Lines 6984-6989 INSERT INTO systempreferences (variable,value,explanation,options,type) VALUES ( Link Here
6984
}
6984
}
6985
6985
6986
6986
6987
6988
$DBversion = "3.13.00.XXX";
6989
if ( C4::Context->preference("Version") < TransformToNum($DBversion) ) {
6990
    $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'");
6991
    print "Upgrade to $DBversion done (Changed OPACItemHolds syspref to Choice)\n";
6992
    SetVersion($DBversion);
6993
}
6994
6987
=head1 FUNCTIONS
6995
=head1 FUNCTIONS
6988
6996
6989
=head2 TableExists($table)
6997
=head2 TableExists($table)
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/opac.pref (-2 / +3 lines)
Lines 454-462 OPAC: Link Here
454
        -
454
        -
455
            - pref: OPACItemHolds
455
            - pref: OPACItemHolds
456
              choices:
456
              choices:
457
                  yes: Allow
458
                  no: "Don't allow"
457
                  no: "Don't allow"
459
            - 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.
458
                  yes: Allow
459
                  force: Force
460
            - 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.
460
        -
461
        -
461
            - pref: OpacRenewalAllowed
462
            - pref: OpacRenewalAllowed
462
              choices:
463
              choices:
(-)a/koha-tmpl/opac-tmpl/prog/en/modules/opac-reserve.tt (-29 / +16 lines)
Lines 278-285 Link Here
278
		  [% END %]
278
		  [% END %]
279
        <th>Hold not needed after</th>
279
        <th>Hold not needed after</th>
280
        [% IF ( OPACShowHoldNotes ) %]<th>Notes</th>[% END %]
280
        [% IF ( OPACShowHoldNotes ) %]<th>Notes</th>[% END %]
281
                  [% IF ( OPACItemHolds ) %]
281
                  [% IF OPACItemHolds == 'yes' %]
282
                    <th id="place_on_hdr" style="display:none">Place on</th>
282
                    <th id="place_on_hdr" style="display:none">Place On</th>
283
                  [% END %]
283
                  [% END %]
284
                  [% UNLESS ( singleBranchMode ) %]
284
                  [% UNLESS ( singleBranchMode ) %]
285
		    [% IF ( choose_branch ) %]
285
		    [% IF ( choose_branch ) %]
Lines 367-416 Link Here
367
    [% IF ( OPACShowHoldNotes ) %][% IF ( bibitemloo.holdable ) %]<td><input type="button" id="shownotes_[% bibitemloo.biblionumber %]" class="shownotes" value="Edit notes"/></td>[% END %][% END %]
367
    [% IF ( OPACShowHoldNotes ) %][% IF ( bibitemloo.holdable ) %]<td><input type="button" id="shownotes_[% bibitemloo.biblionumber %]" class="shownotes" value="Edit notes"/></td>[% END %][% END %]
368
368
369
                    [% IF ( bibitemloo.holdable ) %]
369
                    [% IF ( bibitemloo.holdable ) %]
370
		    <!-- HOLD ABLE -->
370
		    <!-- HOLDABLE -->
371
		    [% IF ( OPACItemHolds ) %]
371
		        [% IF OPACItemHolds == 'yes' %]
372
		    <!-- ITEM HOLDS -->
372
		        <!-- ITEM HOLDS -->
373
                                          <td class="place_on_type" style="display:none">
373
                                          <td class="place_on_type" style="display:none">
374
                                            <ul>
374
                                            <ul>
375
                                                <li>
375
                                                <li>
376
                                                  [% UNLESS ( bibitemloo.holdable ) %]
377
                                                    <input type="radio" name="reqtype_[% bibitemloo.biblionumber %]"
378
                                                           id="reqany_[% bibitemloo.biblionumber %]"
379
                                                           class="selectany"
380
                                                           value="Any"
381
                                                           disabled="disabled"
382
                                                    />
383
                                                  [% ELSE %]
384
                                                    <input type="radio" name="reqtype_[% bibitemloo.biblionumber %]"
376
                                                    <input type="radio" name="reqtype_[% bibitemloo.biblionumber %]"
385
                                                           id="reqany_[% bibitemloo.biblionumber %]"
377
                                                           id="reqany_[% bibitemloo.biblionumber %]"
386
                                                           class="selectany"
378
                                                           class="selectany"
387
                                                           value="Any"
379
                                                           value="Any"
388
                                                           checked="checked"
380
                                                           checked="checked"
389
                                                    />
381
                                                    />
390
                                                  [% END %]
382
                                                    <label for="reqany_[% bibitemloo.biblionumber %]">Next available copy</label>
391
                                                  <label for="reqany_[% bibitemloo.biblionumber %]">Next available copy</label>
392
                                                </li>
383
                                                </li>
393
                                                <li>
384
                                                <li>
394
                                                  [% UNLESS ( bibitemloo.holdable ) %]
395
                                                    <input type="radio" name="reqtype_[% bibitemloo.biblionumber %]"
385
                                                    <input type="radio" name="reqtype_[% bibitemloo.biblionumber %]"
396
                                                           id="reqspecific_[% bibitemloo.biblionumber %]"
386
                                                           id="reqspecific_[% bibitemloo.biblionumber %]"
397
                                                           class="selectspecific"
387
                                                           class="selectspecific"
398
                                                           disabled="disabled"
399
                                                           value="Specific"
388
                                                           value="Specific"
400
                                                    />
389
                                                    />
401
                                                  [% ELSE %]
390
                                                    <label for="reqspecific_[% bibitemloo.biblionumber %]">A specific copy</label>
402
                                                    <input type="radio" name="reqtype_[% bibitemloo.biblionumber %]"
403
                                                           id="reqspecific_[% bibitemloo.biblionumber %]"
404
                                                           class="selectspecific"
405
                                                           value="Specific"
406
                                                    />
407
                                                  [% END %]
408
                                                  <label for="reqspecific_[% bibitemloo.biblionumber %]">A specific copy</label>
409
                                                </li>
391
                                                </li>
410
                                            </ul>
392
                                            </ul>
411
                                          </td>
393
                                          </td>
412
                                        [% END %][% END %]
394
		        [% ELSIF OPACItemHolds == 'force' %]
413
395
<script type="text/javascript">
396
    $(document).ready(function() {
397
        $("#copiesrow_[% bibitemloo.biblionumber %]").show();
398
    });
399
</script>
400
                        [% END %]
401
                    [% END  # holdable%]
414
                    [% UNLESS ( singleBranchMode ) %]
402
                    [% UNLESS ( singleBranchMode ) %]
415
                        [% IF ( bibitemloo.holdable ) %]
403
                        [% IF ( bibitemloo.holdable ) %]
416
			    [% IF ( choose_branch ) %]
404
			    [% IF ( choose_branch ) %]
Lines 456-462 Link Here
456
                  [% END %]
444
                  [% END %]
457
                  [% END %]
445
                  [% END %]
458
446
459
                  [% IF ( OPACItemHolds ) %]
447
                  [% IF OPACItemHolds == 'yes' || OPACItemHolds == 'force' %]
460
                  [% IF ( bibitemloo.holdable ) %]
448
                  [% IF ( bibitemloo.holdable ) %]
461
                    <tr class="copiesrow" id="copiesrow_[% bibitemloo.biblionumber %]">
449
                    <tr class="copiesrow" id="copiesrow_[% bibitemloo.biblionumber %]">
462
                      <td>&nbsp;</td>
450
                      <td>&nbsp;</td>
463
- 

Return to bug 7825