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 6991-6996 if ( CheckVersion($DBversion) ) { Link Here
6991
}
6991
}
6992
6992
6993
6993
6994
6995
$DBversion = "3.13.00.XXX";
6996
if ( C4::Context->preference("Version") < TransformToNum($DBversion) ) {
6997
    $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'");
6998
    print "Upgrade to $DBversion done (Changed OPACItemHolds syspref to Choice)\n";
6999
    SetVersion($DBversion);
7000
}
7001
6994
=head1 FUNCTIONS
7002
=head1 FUNCTIONS
6995
7003
6996
=head2 TableExists($table)
7004
=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 273-280 Link Here
273
		  [% END %]
273
		  [% END %]
274
        <th>Hold not needed after</th>
274
        <th>Hold not needed after</th>
275
        [% IF ( OpacHoldNotes ) %]<th>Notes</th>[% END %]
275
        [% IF ( OpacHoldNotes ) %]<th>Notes</th>[% END %]
276
                  [% IF ( OPACItemHolds ) %]
276
                  [% IF OPACItemHolds == 'yes' %]
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 %]
279
                  [% UNLESS ( singleBranchMode ) %]
279
                  [% UNLESS ( singleBranchMode ) %]
280
		    [% IF ( choose_branch ) %]
280
		    [% IF ( choose_branch ) %]
Lines 362-411 Link Here
362
    [% IF ( OpacHoldNotes ) %][% 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
                    <!-- HOLDABLE -->
366
		    [% IF ( OPACItemHolds ) %]
366
                  [% IF OPACItemHolds == 'yes' %]
367
		    <!-- ITEM HOLDS -->
367
                        <!-- ITEM HOLDS -->
368
                                          <td class="place_on_type" style="display:none">
368
                                          <td class="place_on_type" style="display:none">
369
                                            <ul>
369
                                            <ul>
370
                                                <li>
370
                                                <li>
371
                                                  [% UNLESS ( bibitemloo.holdable ) %]
372
                                                    <input type="radio" name="reqtype_[% bibitemloo.biblionumber %]"
373
                                                           id="reqany_[% bibitemloo.biblionumber %]"
374
                                                           class="selectany"
375
                                                           value="Any"
376
                                                           disabled="disabled"
377
                                                    />
378
                                                  [% ELSE %]
379
                                                    <input type="radio" name="reqtype_[% bibitemloo.biblionumber %]"
371
                                                    <input type="radio" name="reqtype_[% bibitemloo.biblionumber %]"
380
                                                           id="reqany_[% bibitemloo.biblionumber %]"
372
                                                           id="reqany_[% bibitemloo.biblionumber %]"
381
                                                           class="selectany"
373
                                                           class="selectany"
382
                                                           value="Any"
374
                                                           value="Any"
383
                                                           checked="checked"
375
                                                           checked="checked"
384
                                                    />
376
                                                    />
385
                                                  [% END %]
377
                                                    <label for="reqany_[% bibitemloo.biblionumber %]">Next available copy</label>
386
                                                  <label for="reqany_[% bibitemloo.biblionumber %]">Next available copy</label>
387
                                                </li>
378
                                                </li>
388
                                                <li>
379
                                                <li>
389
                                                  [% UNLESS ( bibitemloo.holdable ) %]
390
                                                    <input type="radio" name="reqtype_[% bibitemloo.biblionumber %]"
380
                                                    <input type="radio" name="reqtype_[% bibitemloo.biblionumber %]"
391
                                                           id="reqspecific_[% bibitemloo.biblionumber %]"
381
                                                           id="reqspecific_[% bibitemloo.biblionumber %]"
392
                                                           class="selectspecific"
382
                                                           class="selectspecific"
393
                                                           disabled="disabled"
394
                                                           value="Specific"
383
                                                           value="Specific"
395
                                                    />
384
                                                    />
396
                                                  [% ELSE %]
385
                                                    <label for="reqspecific_[% bibitemloo.biblionumber %]">A specific copy</label>
397
                                                    <input type="radio" name="reqtype_[% bibitemloo.biblionumber %]"
398
                                                           id="reqspecific_[% bibitemloo.biblionumber %]"
399
                                                           class="selectspecific"
400
                                                           value="Specific"
401
                                                    />
402
                                                  [% END %]
403
                                                  <label for="reqspecific_[% bibitemloo.biblionumber %]">A specific copy</label>
404
                                                </li>
386
                                                </li>
405
                                            </ul>
387
                                            </ul>
406
                                          </td>
388
                                          </td>
407
                                        [% END %][% END %]
389
                      [% ELSIF OPACItemHolds == 'force' %]
408
390
<script type="text/javascript">
391
    $(document).ready(function() {
392
        $("#copiesrow_[% bibitemloo.biblionumber %]").show();
393
    });
394
</script>
395
                        [% END %]
396
                    [% END  # holdable%]
409
                    [% UNLESS ( singleBranchMode ) %]
397
                    [% UNLESS ( singleBranchMode ) %]
410
                        [% IF ( bibitemloo.holdable ) %]
398
                        [% IF ( bibitemloo.holdable ) %]
411
			    [% IF ( choose_branch ) %]
399
			    [% IF ( choose_branch ) %]
Lines 451-457 Link Here
451
                  [% END %]
439
                  [% END %]
452
                  [% END %]
440
                  [% END %]
453
441
454
                  [% IF ( OPACItemHolds ) %]
442
                  [% IF OPACItemHolds == 'yes' || OPACItemHolds == 'force' %]
455
                  [% IF ( bibitemloo.holdable ) %]
443
                  [% IF ( bibitemloo.holdable ) %]
456
                    <tr class="copiesrow" id="copiesrow_[% bibitemloo.biblionumber %]">
444
                    <tr class="copiesrow" id="copiesrow_[% bibitemloo.biblionumber %]">
457
                      <td>&nbsp;</td>
445
                      <td>&nbsp;</td>
458
- 

Return to bug 7825