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 6020-6025 if (C4::Context->preference("Version") < TransformToNum($DBversion)) { Link Here
6020
   SetVersion ($DBversion);
6020
   SetVersion ($DBversion);
6021
}
6021
}
6022
6022
6023
$DBversion = "3.09.00.XXX";
6024
if ( C4::Context->preference("Version") < TransformToNum($DBversion) ) {
6025
    $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'");
6026
    print "Upgrade to $DBversion done (Changed OPACItemHolds syspref to Choice)\n";
6027
    SetVersion($DBversion);
6028
}
6029
6023
=head1 FUNCTIONS
6030
=head1 FUNCTIONS
6024
6031
6025
=head2 TableExists($table)
6032
=head2 TableExists($table)
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/opac.pref (-2 / +3 lines)
Lines 409-417 OPAC: Link Here
409
        -
409
        -
410
            - pref: OPACItemHolds
410
            - pref: OPACItemHolds
411
              choices:
411
              choices:
412
                  yes: Allow
413
                  no: "Don't allow"
412
                  no: "Don't allow"
414
            - 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.
413
                  yes: Allow
414
                  force: Force
415
            - 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.
415
        -
416
        -
416
            - pref: OpacRenewalAllowed
417
            - pref: OpacRenewalAllowed
417
              choices:
418
              choices:
(-)a/koha-tmpl/opac-tmpl/prog/en/modules/opac-reserve.tt (-29 / +16 lines)
Lines 252-259 Link Here
252
        <th>Hold starts on date</th>
252
        <th>Hold starts on date</th>
253
		  [% END %]
253
		  [% END %]
254
        <th>Hold not needed after</th>
254
        <th>Hold not needed after</th>
255
                  [% IF ( OPACItemHolds ) %]
255
                  [% IF OPACItemHolds == 'yes' %]
256
                    <th id="place_on_hdr" style="display:none">Place on</th>
256
                    <th id="place_on_hdr" style="display:none">Place On</th>
257
                  [% END %]
257
                  [% END %]
258
                  [% UNLESS ( singleBranchMode ) %]
258
                  [% UNLESS ( singleBranchMode ) %]
259
		    [% IF ( choose_branch ) %]
259
		    [% IF ( choose_branch ) %]
Lines 335-384 Link Here
335
    </td>[% END %]
335
    </td>[% END %]
336
336
337
                    [% IF ( bibitemloo.holdable ) %]
337
                    [% IF ( bibitemloo.holdable ) %]
338
		    <!-- HOLD ABLE -->
338
		    <!-- HOLDABLE -->
339
		    [% IF ( OPACItemHolds ) %]
339
		        [% IF OPACItemHolds == 'yes' %]
340
		    <!-- ITEM HOLDS -->
340
		        <!-- ITEM HOLDS -->
341
                                          <td class="place_on_type" style="display:none">
341
                                          <td class="place_on_type" style="display:none">
342
                                            <ul>
342
                                            <ul>
343
                                                <li>
343
                                                <li>
344
                                                  [% UNLESS ( bibitemloo.holdable ) %]
345
                                                    <input type="radio" name="reqtype_[% bibitemloo.biblionumber %]"
346
                                                           id="reqany_[% bibitemloo.biblionumber %]"
347
                                                           class="selectany"
348
                                                           value="Any"
349
                                                           disabled="disabled"
350
                                                    />
351
                                                  [% ELSE %]
352
                                                    <input type="radio" name="reqtype_[% bibitemloo.biblionumber %]"
344
                                                    <input type="radio" name="reqtype_[% bibitemloo.biblionumber %]"
353
                                                           id="reqany_[% bibitemloo.biblionumber %]"
345
                                                           id="reqany_[% bibitemloo.biblionumber %]"
354
                                                           class="selectany"
346
                                                           class="selectany"
355
                                                           value="Any"
347
                                                           value="Any"
356
                                                           checked="checked"
348
                                                           checked="checked"
357
                                                    />
349
                                                    />
358
                                                  [% END %]
350
                                                    <label for="reqany_[% bibitemloo.biblionumber %]">Next available copy</label>
359
                                                  <label for="reqany_[% bibitemloo.biblionumber %]">Next available copy</label>
360
                                                </li>
351
                                                </li>
361
                                                <li>
352
                                                <li>
362
                                                  [% UNLESS ( bibitemloo.holdable ) %]
363
                                                    <input type="radio" name="reqtype_[% bibitemloo.biblionumber %]"
353
                                                    <input type="radio" name="reqtype_[% bibitemloo.biblionumber %]"
364
                                                           id="reqspecific_[% bibitemloo.biblionumber %]"
354
                                                           id="reqspecific_[% bibitemloo.biblionumber %]"
365
                                                           class="selectspecific"
355
                                                           class="selectspecific"
366
                                                           disabled="disabled"
367
                                                           value="Specific"
356
                                                           value="Specific"
368
                                                    />
357
                                                    />
369
                                                  [% ELSE %]
358
                                                    <label for="reqspecific_[% bibitemloo.biblionumber %]">A specific copy</label>
370
                                                    <input type="radio" name="reqtype_[% bibitemloo.biblionumber %]"
371
                                                           id="reqspecific_[% bibitemloo.biblionumber %]"
372
                                                           class="selectspecific"
373
                                                           value="Specific"
374
                                                    />
375
                                                  [% END %]
376
                                                  <label for="reqspecific_[% bibitemloo.biblionumber %]">A specific copy</label>
377
                                                </li>
359
                                                </li>
378
                                            </ul>
360
                                            </ul>
379
                                          </td>
361
                                          </td>
380
                                        [% END %][% END %]
362
		        [% ELSIF OPACItemHolds == 'force' %]
381
363
<script type="text/javascript">
364
    $(document).ready(function() {
365
        $("#copiesrow_[% bibitemloo.biblionumber %]").show();
366
    });
367
</script>
368
                        [% END %]
369
                    [% END  # holdable%]
382
                    [% UNLESS ( singleBranchMode ) %]
370
                    [% UNLESS ( singleBranchMode ) %]
383
                        [% IF ( bibitemloo.holdable ) %]
371
                        [% IF ( bibitemloo.holdable ) %]
384
			    [% IF ( choose_branch ) %]
372
			    [% IF ( choose_branch ) %]
Lines 410-416 Link Here
410
                    [% END %]
398
                    [% END %]
411
                  </tr>
399
                  </tr>
412
400
413
                  [% IF ( OPACItemHolds ) %]
401
                  [% IF OPACItemHolds == 'yes' || OPACItemHolds == 'force' %]
414
                  [% IF ( bibitemloo.holdable ) %]
402
                  [% IF ( bibitemloo.holdable ) %]
415
                    <tr class="copiesrow" id="copiesrow_[% bibitemloo.biblionumber %]">
403
                    <tr class="copiesrow" id="copiesrow_[% bibitemloo.biblionumber %]">
416
                      <td>&nbsp;</td>
404
                      <td>&nbsp;</td>
417
- 

Return to bug 7825