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','1','Allow OPAC users to place hold on specific items. If OFF, users can only request next available copy.','','YesNo');
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');
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 (+7 lines)
Lines 6407-6412 if ( CheckVersion($DBversion) ) { Link Here
6407
   SetVersion ($DBversion);
6407
   SetVersion ($DBversion);
6408
}
6408
}
6409
6409
6410
$DBversion = "3.11.00.XXX";
6411
if ( C4::Context->preference("Version") < TransformToNum($DBversion) ) {
6412
    $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'");
6413
    print "Upgrade to $DBversion done (Changed OPACItemHolds syspref to Choice)\n";
6414
    SetVersion($DBversion);
6415
}
6416
6410
=head1 FUNCTIONS
6417
=head1 FUNCTIONS
6411
6418
6412
=head2 TableExists($table)
6419
=head2 TableExists($table)
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/opac.pref (-2 / +3 lines)
Lines 421-429 OPAC: Link Here
421
        -
421
        -
422
            - pref: OPACItemHolds
422
            - pref: OPACItemHolds
423
              choices:
423
              choices:
424
                  yes: Allow
425
                  no: "Don't allow"
424
                  no: "Don't allow"
426
            - 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.
425
                  yes: Allow
426
                  force: Force
427
            - 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.
427
        -
428
        -
428
            - pref: OpacRenewalAllowed
429
            - pref: OpacRenewalAllowed
429
              choices:
430
              choices:
(-)a/koha-tmpl/opac-tmpl/prog/en/modules/opac-reserve.tt (-29 / +16 lines)
Lines 253-260 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 ) %]
256
                  [% IF OPACItemHolds == 'yes' %]
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 ) %]
260
		    [% IF ( choose_branch ) %]
260
		    [% IF ( choose_branch ) %]
Lines 340-389 Link Here
340
    </td>[% END %]
340
    </td>[% END %]
341
341
342
                    [% IF ( bibitemloo.holdable ) %]
342
                    [% IF ( bibitemloo.holdable ) %]
343
		    <!-- HOLD ABLE -->
343
		    <!-- HOLDABLE -->
344
		    [% IF ( OPACItemHolds ) %]
344
		        [% IF OPACItemHolds == 'yes' %]
345
		    <!-- ITEM HOLDS -->
345
		        <!-- ITEM HOLDS -->
346
                                          <td class="place_on_type" style="display:none">
346
                                          <td class="place_on_type" style="display:none">
347
                                            <ul>
347
                                            <ul>
348
                                                <li>
348
                                                <li>
349
                                                  [% UNLESS ( bibitemloo.holdable ) %]
350
                                                    <input type="radio" name="reqtype_[% bibitemloo.biblionumber %]"
351
                                                           id="reqany_[% bibitemloo.biblionumber %]"
352
                                                           class="selectany"
353
                                                           value="Any"
354
                                                           disabled="disabled"
355
                                                    />
356
                                                  [% ELSE %]
357
                                                    <input type="radio" name="reqtype_[% bibitemloo.biblionumber %]"
349
                                                    <input type="radio" name="reqtype_[% bibitemloo.biblionumber %]"
358
                                                           id="reqany_[% bibitemloo.biblionumber %]"
350
                                                           id="reqany_[% bibitemloo.biblionumber %]"
359
                                                           class="selectany"
351
                                                           class="selectany"
360
                                                           value="Any"
352
                                                           value="Any"
361
                                                           checked="checked"
353
                                                           checked="checked"
362
                                                    />
354
                                                    />
363
                                                  [% END %]
355
                                                    <label for="reqany_[% bibitemloo.biblionumber %]">Next available copy</label>
364
                                                  <label for="reqany_[% bibitemloo.biblionumber %]">Next available copy</label>
365
                                                </li>
356
                                                </li>
366
                                                <li>
357
                                                <li>
367
                                                  [% UNLESS ( bibitemloo.holdable ) %]
368
                                                    <input type="radio" name="reqtype_[% bibitemloo.biblionumber %]"
358
                                                    <input type="radio" name="reqtype_[% bibitemloo.biblionumber %]"
369
                                                           id="reqspecific_[% bibitemloo.biblionumber %]"
359
                                                           id="reqspecific_[% bibitemloo.biblionumber %]"
370
                                                           class="selectspecific"
360
                                                           class="selectspecific"
371
                                                           disabled="disabled"
372
                                                           value="Specific"
361
                                                           value="Specific"
373
                                                    />
362
                                                    />
374
                                                  [% ELSE %]
363
                                                    <label for="reqspecific_[% bibitemloo.biblionumber %]">A specific copy</label>
375
                                                    <input type="radio" name="reqtype_[% bibitemloo.biblionumber %]"
376
                                                           id="reqspecific_[% bibitemloo.biblionumber %]"
377
                                                           class="selectspecific"
378
                                                           value="Specific"
379
                                                    />
380
                                                  [% END %]
381
                                                  <label for="reqspecific_[% bibitemloo.biblionumber %]">A specific copy</label>
382
                                                </li>
364
                                                </li>
383
                                            </ul>
365
                                            </ul>
384
                                          </td>
366
                                          </td>
385
                                        [% END %][% END %]
367
		        [% ELSIF OPACItemHolds == 'force' %]
386
368
<script type="text/javascript">
369
    $(document).ready(function() {
370
        $("#copiesrow_[% bibitemloo.biblionumber %]").show();
371
    });
372
</script>
373
                        [% END %]
374
                    [% END  # holdable%]
387
                    [% UNLESS ( singleBranchMode ) %]
375
                    [% UNLESS ( singleBranchMode ) %]
388
                        [% IF ( bibitemloo.holdable ) %]
376
                        [% IF ( bibitemloo.holdable ) %]
389
			    [% IF ( choose_branch ) %]
377
			    [% IF ( choose_branch ) %]
Lines 415-421 Link Here
415
                    [% END %]
403
                    [% END %]
416
                  </tr>
404
                  </tr>
417
405
418
                  [% IF ( OPACItemHolds ) %]
406
                  [% IF OPACItemHolds == 'yes' || OPACItemHolds == 'force' %]
419
                  [% IF ( bibitemloo.holdable ) %]
407
                  [% IF ( bibitemloo.holdable ) %]
420
                    <tr class="copiesrow" id="copiesrow_[% bibitemloo.biblionumber %]">
408
                    <tr class="copiesrow" id="copiesrow_[% bibitemloo.biblionumber %]">
421
                      <td>&nbsp;</td>
409
                      <td>&nbsp;</td>
422
- 

Return to bug 7825