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

(-)a/installer/data/mysql/de-DE/mandatory/userpermissions.sql (-1 / +3 lines)
Lines 1-7 Link Here
1
INSERT INTO permissions (module_bit, code, description) VALUES
1
INSERT INTO permissions (module_bit, code, description) VALUES
2
   ( 1, 'circulate_remaining_permissions', 'Übrige Ausleihberechtigungen'),
2
   ( 1, 'circulate_remaining_permissions', 'Übrige Ausleihberechtigungen'),
3
   ( 1, 'override_renewals', 'Gesperrte Verlängerungen überschreiben'),
3
   ( 1, 'override_renewals', 'Vormerksperren übergehen'),
4
   ( 1, 'overdues_report', 'Überfälligkeiten-Report ausführen'),
4
   ( 1, 'overdues_report', 'Überfälligkeiten-Report ausführen'),
5
   ( 1, 'force_checkout', 'Ausleihsperren übergehen'),
6
   ( 1, 'manage_restrictions', 'Kontosperre "Gesperrt" aufheben'),
5
   ( 3, 'parameters_remaining_permissions', 'Übrige Administrationsberechtigungen'),
7
   ( 3, 'parameters_remaining_permissions', 'Übrige Administrationsberechtigungen'),
6
   ( 3, 'manage_circ_rules', 'Ausleihkonditionen verwalten'),
8
   ( 3, 'manage_circ_rules', 'Ausleihkonditionen verwalten'),
7
   ( 6, 'place_holds', 'Vormerkungen für Benutzer setzen'),
9
   ( 6, 'place_holds', 'Vormerkungen für Benutzer setzen'),
(-)a/installer/data/mysql/en/mandatory/userpermissions.sql (+2 lines)
Lines 2-7 INSERT INTO permissions (module_bit, code, description) VALUES Link Here
2
   ( 1, 'circulate_remaining_permissions', 'Remaining circulation permissions'),
2
   ( 1, 'circulate_remaining_permissions', 'Remaining circulation permissions'),
3
   ( 1, 'override_renewals', 'Override blocked renewals'),
3
   ( 1, 'override_renewals', 'Override blocked renewals'),
4
   ( 1, 'overdues_report', 'Execute overdue items report'),
4
   ( 1, 'overdues_report', 'Execute overdue items report'),
5
   ( 1, 'force_checkout', 'Force checkout if a limitation exists'),
6
   ( 1, 'manage_restrictions', 'Manage restrictions for accounts'),
5
   ( 3, 'parameters_remaining_permissions', 'Remaining system parameters permissions'),
7
   ( 3, 'parameters_remaining_permissions', 'Remaining system parameters permissions'),
6
   ( 3, 'manage_circ_rules', 'manage circulation rules'),
8
   ( 3, 'manage_circ_rules', 'manage circulation rules'),
7
   ( 6, 'place_holds', 'Place holds for patrons'),
9
   ( 6, 'place_holds', 'Place holds for patrons'),
(-)a/installer/data/mysql/es-ES/mandatory/userpermissions.sql (+2 lines)
Lines 2-7 INSERT INTO permissions (module_bit, code, description) VALUES Link Here
2
   ( 1, 'circulate_remaining_permissions', 'Remaining circulation permissions'),
2
   ( 1, 'circulate_remaining_permissions', 'Remaining circulation permissions'),
3
   ( 1, 'override_renewals', 'Override blocked renewals'),
3
   ( 1, 'override_renewals', 'Override blocked renewals'),
4
   ( 1, 'overdues_report', 'Execute overdue items report'),
4
   ( 1, 'overdues_report', 'Execute overdue items report'),
5
   ( 1, 'force_checkout', 'Force checkout if a limitation exists'),
6
   ( 1, 'manage_restrictions', 'Manage restrictions for accounts'),
5
   ( 3, 'parameters_remaining_permissions', 'Remaining system parameters permissions'),
7
   ( 3, 'parameters_remaining_permissions', 'Remaining system parameters permissions'),
6
   ( 3, 'manage_circ_rules', 'manage circulation rules'),
8
   ( 3, 'manage_circ_rules', 'manage circulation rules'),
7
   ( 6, 'place_holds', 'Place holds for patrons'),
9
   ( 6, 'place_holds', 'Place holds for patrons'),
(-)a/installer/data/mysql/fr-FR/1-Obligatoire/userpermissions.sql (+2 lines)
Lines 2-7 INSERT INTO permissions (module_bit, code, description) VALUES Link Here
2
   ( 1, 'circulate_remaining_permissions', 'Fonctions de circulation restantes'),
2
   ( 1, 'circulate_remaining_permissions', 'Fonctions de circulation restantes'),
3
   ( 1, 'override_renewals', 'Outrepasser les limites de renouvellement'),
3
   ( 1, 'override_renewals', 'Outrepasser les limites de renouvellement'),
4
   ( 1, 'overdues_report', 'Executer le rapport de retards'),
4
   ( 1, 'overdues_report', 'Executer le rapport de retards'),
5
   ( 1, 'force_checkout', 'Forcer le prêt si une limitation existe'),
6
   ( 1, 'manage_restrictions', 'Gérer les suspensions d\'un utilisateur'),
5
   ( 3, 'parameters_remaining_permissions', 'Paramètres du système restants'),
7
   ( 3, 'parameters_remaining_permissions', 'Paramètres du système restants'),
6
   ( 3, 'manage_circ_rules', 'Gestion des règles de circulation'),
8
   ( 3, 'manage_circ_rules', 'Gestion des règles de circulation'),
7
   ( 6, 'place_holds', 'Réserver pour des adhérents'),
9
   ( 6, 'place_holds', 'Réserver pour des adhérents'),
(-)a/installer/data/mysql/it-IT/necessari/userpermissions.sql (+2 lines)
Lines 4-9 INSERT INTO permissions (module_bit, code, description) VALUES Link Here
4
   ( 1, 'circulate_remaining_permissions', 'Permessi rimanenti per la circolazione'),
4
   ( 1, 'circulate_remaining_permissions', 'Permessi rimanenti per la circolazione'),
5
   ( 1, 'override_renewals', 'Sblocca i rinnovi bloccati'),
5
   ( 1, 'override_renewals', 'Sblocca i rinnovi bloccati'),
6
   ( 1, 'overdues_report', 'Execute overdue items report'),
6
   ( 1, 'overdues_report', 'Execute overdue items report'),
7
   ( 1, 'force_checkout', 'Force checkout if a limitation exists'),
8
   ( 1, 'manage_restrictions', 'Manage restrictions for accounts'),
7
   ( 3, 'parameters_remaining_permissions', 'Permessi rimanenti'),
9
   ( 3, 'parameters_remaining_permissions', 'Permessi rimanenti'),
8
   ( 3, 'manage_circ_rules', 'Gestisci regole circolazione'),
10
   ( 3, 'manage_circ_rules', 'Gestisci regole circolazione'),
9
   ( 6, 'place_holds', 'Fai prenotazioni per gli utenti'),
11
   ( 6, 'place_holds', 'Fai prenotazioni per gli utenti'),
(-)a/installer/data/mysql/nb-NO/1-Obligatorisk/userpermissions.sql (+2 lines)
Lines 22-27 INSERT INTO permissions (module_bit, code, description) VALUES Link Here
22
   ( 1, 'circulate_remaining_permissions', 'Øvrige rettigheter for sirkulasjon'),
22
   ( 1, 'circulate_remaining_permissions', 'Øvrige rettigheter for sirkulasjon'),
23
   ( 1, 'override_renewals', 'Overstyre blokkerte fornyinger'),
23
   ( 1, 'override_renewals', 'Overstyre blokkerte fornyinger'),
24
   ( 1, 'overdues_report', 'Execute overdue items report'),
24
   ( 1, 'overdues_report', 'Execute overdue items report'),
25
   ( 1, 'force_checkout', 'Force checkout if a limitation exists'),
26
   ( 1, 'manage_restrictions', 'Manage restrictions for accounts'),
25
   ( 3, 'parameters_remaining_permissions', 'Øvrige rettigheter knyttet til systempreferanser'),
27
   ( 3, 'parameters_remaining_permissions', 'Øvrige rettigheter knyttet til systempreferanser'),
26
   ( 3, 'manage_circ_rules', 'Endre sirkulasjonsregler'),
28
   ( 3, 'manage_circ_rules', 'Endre sirkulasjonsregler'),
27
   ( 6, 'place_holds', 'Foreta reservering for lånere'),
29
   ( 6, 'place_holds', 'Foreta reservering for lånere'),
(-)a/installer/data/mysql/pl-PL/mandatory/userpermissions.sql (+2 lines)
Lines 2-7 INSERT INTO permissions (module_bit, code, description) VALUES Link Here
2
   ( 1, 'circulate_remaining_permissions', 'Remaining circulation permissions'),
2
   ( 1, 'circulate_remaining_permissions', 'Remaining circulation permissions'),
3
   ( 1, 'override_renewals', 'Override blocked renewals'),
3
   ( 1, 'override_renewals', 'Override blocked renewals'),
4
   ( 1, 'overdues_report', 'Execute overdue items report'),
4
   ( 1, 'overdues_report', 'Execute overdue items report'),
5
   ( 1, 'force_checkout', 'Force checkout if a limitation exists'),
6
   ( 1, 'manage_restrictions', 'Manage restrictions for accounts'),
5
   ( 3, 'parameters_remaining_permissions', 'Remaining system parameters permissions'),
7
   ( 3, 'parameters_remaining_permissions', 'Remaining system parameters permissions'),
6
   ( 3, 'manage_circ_rules', 'manage circulation rules'),
8
   ( 3, 'manage_circ_rules', 'manage circulation rules'),
7
   ( 6, 'place_holds', 'Place holds for patrons'),
9
   ( 6, 'place_holds', 'Place holds for patrons'),
(-)a/installer/data/mysql/ru-RU/mandatory/permissions_and_user_flags.sql (+2 lines)
Lines 28-33 INSERT INTO permissions (module_bit, code, description) VALUES Link Here
28
   ( 1, 'circulate_remaining_permissions', 'Remaining circulation permissions'),
28
   ( 1, 'circulate_remaining_permissions', 'Remaining circulation permissions'),
29
   ( 1, 'override_renewals', 'Override blocked renewals'),
29
   ( 1, 'override_renewals', 'Override blocked renewals'),
30
   ( 1, 'overdues_report', 'Execute overdue items report'),
30
   ( 1, 'overdues_report', 'Execute overdue items report'),
31
   ( 1, 'force_checkout', 'Force checkout if a limitation exists'),
32
   ( 1, 'manage_restrictions', 'Manage restrictions for accounts'),
31
   ( 3, 'parameters_remaining_permissions', 'Remaining system parameters permissions'),
33
   ( 3, 'parameters_remaining_permissions', 'Remaining system parameters permissions'),
32
   ( 3, 'manage_circ_rules', 'manage circulation rules'),
34
   ( 3, 'manage_circ_rules', 'manage circulation rules'),
33
   ( 6, 'place_holds', 'Place holds for patrons'),
35
   ( 6, 'place_holds', 'Place holds for patrons'),
(-)a/installer/data/mysql/uk-UA/mandatory/permissions_and_user_flags.sql (+2 lines)
Lines 28-33 INSERT INTO permissions (module_bit, code, description) VALUES Link Here
28
   ( 1, 'circulate_remaining_permissions', 'Remaining circulation permissions'),
28
   ( 1, 'circulate_remaining_permissions', 'Remaining circulation permissions'),
29
   ( 1, 'override_renewals', 'Override blocked renewals'),
29
   ( 1, 'override_renewals', 'Override blocked renewals'),
30
   ( 1, 'overdues_report', 'Execute overdue items report'),
30
   ( 1, 'overdues_report', 'Execute overdue items report'),
31
   ( 1, 'force_checkout', 'Force checkout if a limitation exists'),
32
   ( 1, 'manage_restrictions', 'Manage restrictions for accounts'),
31
   ( 3, 'parameters_remaining_permissions', 'Remaining system parameters permissions'),
33
   ( 3, 'parameters_remaining_permissions', 'Remaining system parameters permissions'),
32
   ( 3, 'manage_circ_rules', 'manage circulation rules'),
34
   ( 3, 'manage_circ_rules', 'manage circulation rules'),
33
   ( 6, 'place_holds', 'Place holds for patrons'),
35
   ( 6, 'place_holds', 'Place holds for patrons'),
(-)a/installer/data/mysql/updatedatabase.pl (+28 lines)
Lines 7743-7748 if(CheckVersion($DBversion)) { Link Here
7743
    SetVersion($DBversion);
7743
    SetVersion($DBversion);
7744
}
7744
}
7745
7745
7746
7747
$DBversion = "3.13.00.XXX";
7748
if ( CheckVersion($DBversion) ) {
7749
    $dbh->do(q{
7750
        INSERT INTO permissions (module_bit, code, description) VALUES ( 1, 'force_checkout', 'Force checkout if a limitation exists')
7751
    });
7752
    $dbh->do(q{
7753
        INSERT INTO permissions (module_bit, code, description) VALUES ( 1, 'manage_restrictions', 'Lift restriction for restricted accounts')
7754
    });
7755
    $dbh->do(q{
7756
        INSERT INTO user_permissions (borrowernumber, module_bit, code)
7757
            SELECT user_permissions.borrowernumber, 1, 'force_checkout'
7758
            FROM user_permissions
7759
            LEFT JOIN borrowers USING(borrowernumber)
7760
            WHERE borrowers.flags & (1 << 1)
7761
    });
7762
    $dbh->do(q{
7763
        INSERT INTO user_permissions (borrowernumber, module_bit, code)
7764
            SELECT user_permissions.borrowernumber, 1, 'manage_restrictions'
7765
            FROM user_permissions
7766
            LEFT JOIN borrowers USING(borrowernumber)
7767
            WHERE borrowers.flags & (1 << 1)
7768
    });
7769
7770
    print "Upgrade to $DBversion done (Bug 10863 - Add permission force_checkout and manage_restrictions)\n";
7771
    SetVersion($DBversion);
7772
}
7773
7746
=head1 FUNCTIONS
7774
=head1 FUNCTIONS
7747
7775
7748
=head2 TableExists($table)
7776
=head2 TableExists($table)
(-)a/koha-tmpl/intranet-tmpl/prog/en/includes/borrower_debarments.inc (-4 / +4 lines)
Lines 31-37 Link Here
31
                     <th>Type</th>
31
                     <th>Type</th>
32
                     <th>Comment</th>
32
                     <th>Comment</th>
33
                     <th>Expiration</th>
33
                     <th>Expiration</th>
34
                     [% IF ( CAN_user_borrowers ) %]
34
                     [% IF CAN_user_borrowers && CAN_user_circulate_manage_restrictions %]
35
                         <th>&nbsp;</th>
35
                         <th>&nbsp;</th>
36
                     [% END %]
36
                     [% END %]
37
                </tr>
37
                </tr>
Lines 42-48 Link Here
42
                        <td>[% d.type %]</td>
42
                        <td>[% d.type %]</td>
43
                        <td>[% d.comment %]</td>
43
                        <td>[% d.comment %]</td>
44
                        <td>[% IF d.expiration %] [% d.expiration | $KohaDates %] [% ELSE %] <i>Indefinite</i> [% END %]</td>
44
                        <td>[% IF d.expiration %] [% d.expiration | $KohaDates %] [% ELSE %] <i>Indefinite</i> [% END %]</td>
45
                        [% IF ( CAN_user_borrowers )%]
45
                        [% IF CAN_user_borrowers && CAN_user_circulate_manage_restrictions %]
46
                            <td>
46
                            <td>
47
                                <a class="remove_restriction" href="/cgi-bin/koha/members/mod_debarment.pl?borrowernumber=[% borrowernumber %]&amp;borrower_debarment_id=[% d.borrower_debarment_id %]&amp;action=del">
47
                                <a class="remove_restriction" href="/cgi-bin/koha/members/mod_debarment.pl?borrowernumber=[% borrowernumber %]&amp;borrower_debarment_id=[% d.borrower_debarment_id %]&amp;action=del">
48
                                    Remove
48
                                    Remove
Lines 54-61 Link Here
54
            </tbody>
54
            </tbody>
55
        </table>
55
        </table>
56
    [% END %]
56
    [% END %]
57
    <p><a href="#" id="add_manual_restriction">Add manual restriction</a></p>
57
    [% IF CAN_user_borrowers && CAN_user_circulate_manage_restrictions %]
58
    [% IF ( CAN_user_borrowers )%]
58
        <p><a href="#" id="add_manual_restriction">Add manual restriction</a></p>
59
        <form method="post" action="/cgi-bin/koha/members/mod_debarment.pl" class="clearfix">
59
        <form method="post" action="/cgi-bin/koha/members/mod_debarment.pl" class="clearfix">
60
            <input type="hidden" name="borrowernumber" value="[% borrowernumber %]" />
60
            <input type="hidden" name="borrowernumber" value="[% borrowernumber %]" />
61
            <input type="hidden" name="action" value="add" />
61
            <input type="hidden" name="action" value="add" />
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tt (-7 / +32 lines)
Lines 185-195 var MSG_EXPORT_SELECT_CHECKOUTS = _("You must select checkout(s) to export"); Link Here
185
<div class="yui-g">
185
<div class="yui-g">
186
186
187
<div id="circ_needsconfirmation" class="dialog alert">
187
<div id="circ_needsconfirmation" class="dialog alert">
188
<h3>Please confirm checkout</h3>
188
[% IF CAN_user_circulate_force_checkout %]
189
  <h3>Please confirm checkout</h3>
190
[% ELSE %]
191
  <h3>Cannot check out</h3>
192
[% END %]
189
193
190
<ul>
194
<ul>
191
[%IF ( AGE_RESTRICTION ) %]
195
[%IF ( AGE_RESTRICTION ) %]
192
    <li>Age restriction [% AGE_RESTRICTION %]. Check out anyway?</li>
196
    <li>Age restriction [% AGE_RESTRICTION %].
197
      [% IF CAN_user_circulate_force_checkout %]
198
        Check out anyway?
199
      [% END %]
200
    </li>
193
[% END %]
201
[% END %]
194
202
195
[% IF ( DEBT ) %]
203
[% IF ( DEBT ) %]
Lines 209-215 var MSG_EXPORT_SELECT_CHECKOUTS = _("You must select checkout(s) to export"); Link Here
209
[% END %]
217
[% END %]
210
218
211
[% IF ( ISSUED_TO_ANOTHER ) %]
219
[% IF ( ISSUED_TO_ANOTHER ) %]
212
    <li>Item <i>[% getTitleMessageIteminfo %]</i> ([% getBarcodeMessageIteminfo %]) is checked out to <a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% issued_borrowernumber %]">[% issued_firstname %] [% issued_surname %]</a> ([% issued_cardnumber %]). Check in and check out?</li>
220
    <li>Item <i>[% getTitleMessageIteminfo %]</i> ([% getBarcodeMessageIteminfo %]) is checked out to <a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% issued_borrowernumber %]">[% issued_firstname %] [% issued_surname %]</a> ([% issued_cardnumber %]).
221
      [% IF CAN_user_circulate_force_checkout %]
222
        Check in and check out?
223
      [% END %]
224
    </li>
213
[% END %]
225
[% END %]
214
226
215
[% IF ( TOO_MANY ) %]
227
[% IF ( TOO_MANY ) %]
Lines 232-251 var MSG_EXPORT_SELECT_CHECKOUTS = _("You must select checkout(s) to export"); Link Here
232
        [% item_notforloan_lib = KohaAuthorisedValues.GetByCode( authvalcode_notforloan, item_notforloan, 0 ) %]
244
        [% item_notforloan_lib = KohaAuthorisedValues.GetByCode( authvalcode_notforloan, item_notforloan, 0 ) %]
233
        Item is normally not for loan [% IF (item_notforloan_lib) %]([% item_notforloan_lib %])[% END %].
245
        Item is normally not for loan [% IF (item_notforloan_lib) %]([% item_notforloan_lib %])[% END %].
234
    [% END %]
246
    [% END %]
247
      [% IF CAN_user_circulate_force_checkout %]
235
        Check out anyway?
248
        Check out anyway?
249
      [% END %]
236
    </li>
250
    </li>
237
[% END %]
251
[% END %]
238
252
239
[% IF ( USERBLOCKEDOVERDUE ) %]
253
[% IF ( USERBLOCKEDOVERDUE ) %]
240
    <li>Patron has [% USERBLOCKEDOVERDUE %] overdue item(s).  Check out anyway?</li>
254
    <li>Patron has [% USERBLOCKEDOVERDUE %] overdue item(s).
255
      [% IF CAN_user_circulate_force_checkout %]
256
       Check out anyway?
257
      [% END %]
258
    </li>
241
[% END %]
259
[% END %]
242
260
243
[% IF ( ITEM_LOST ) %]
261
[% IF ( ITEM_LOST ) %]
244
    <li>This item has been lost with a status of "[% ITEM_LOST %]". Check out anyway?</li>
262
    <li>This item has been lost with a status of "[% ITEM_LOST %]".
263
      [% IF CAN_user_circulate_force_checkout %]
264
        Check out anyway?
265
      [% END %]
266
    </li>
245
[% END %]
267
[% END %]
246
268
247
[% IF  HIGHHOLDS %]
269
[% IF  HIGHHOLDS %]
248
	<li>High demand item. Loan period shortened to [% HIGHHOLDS.duration %] days (due [% HIGHHOLDS.returndate %]). Check out anyway?</li>
270
    <li>High demand item. Loan period shortened to [% HIGHHOLDS.duration %] days (due [% HIGHHOLDS.returndate %]). Check out anyway?</li>
249
[% END %]
271
[% END %]
250
</ul>
272
</ul>
251
273
Lines 256-261 var MSG_EXPORT_SELECT_CHECKOUTS = _("You must select checkout(s) to export"); Link Here
256
	});
278
	});
257
	</script>
279
	</script>
258
[% END %]
280
[% END %]
281
282
[% IF CAN_user_circulate_force_checkout or HIGHHOLDS %]
259
<form method="post" action="/cgi-bin/koha/circ/circulation.pl" autocomplete="off">
283
<form method="post" action="/cgi-bin/koha/circ/circulation.pl" autocomplete="off">
260
284
261
[% IF ( RESERVED ) %]
285
[% IF ( RESERVED ) %]
Lines 305-310 var MSG_EXPORT_SELECT_CHECKOUTS = _("You must select checkout(s) to export"); Link Here
305
    <input type="submit" class="deny" value="No, Don't Check Out (N)" accesskey="n" />
329
    <input type="submit" class="deny" value="No, Don't Check Out (N)" accesskey="n" />
306
    [% END %]
330
    [% END %]
307
</form>
331
</form>
332
[% END %]
308
333
309
</div></div>
334
</div></div>
310
[% END %] <!-- NEEDSCONFIRMATION -->
335
[% END %] <!-- NEEDSCONFIRMATION -->
Lines 481-487 No patron matched <span class="ex">[% message %]</span> Link Here
481
506
482
	<div class="hint">Enter item barcode:</div>
507
	<div class="hint">Enter item barcode:</div>
483
508
484
    [% IF ( NEEDSCONFIRMATION ) %]
509
    [% IF NEEDSCONFIRMATION %]
485
	    <input type="text" name="barcode" id="barcode" class="barcode focus" size="14" disabled="disabled" />
510
	    <input type="text" name="barcode" id="barcode" class="barcode focus" size="14" disabled="disabled" />
486
    [% ELSE %]
511
    [% ELSE %]
487
	    <input type="text" name="barcode" id="barcode" class="barcode focus" size="14" />
512
	    <input type="text" name="barcode" id="barcode" class="barcode focus" size="14" />
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/members/memberentrygen.tt (-4 / +13 lines)
Lines 1170-1175 Link Here
1170
                [% IF ( flagloo.key == 'gonenoaddress' ) %]Gone no address:[% END %]
1170
                [% IF ( flagloo.key == 'gonenoaddress' ) %]Gone no address:[% END %]
1171
                [% IF ( flagloo.key == 'lost' ) %]Lost card:[% END %]
1171
                [% IF ( flagloo.key == 'lost' ) %]Lost card:[% END %]
1172
                </label>
1172
                </label>
1173
                [% IF CAN_user_circulate_manage_restrictions %]
1173
				<label for="yes[% flagloo.name %]">Yes </label>
1174
				<label for="yes[% flagloo.name %]">Yes </label>
1174
				[% IF ( flagloo.yes ) %]
1175
				[% IF ( flagloo.yes ) %]
1175
				<input type="radio" id="yes[% flagloo.name %]" name="[% flagloo.name %]" value="1" checked="checked" />
1176
				<input type="radio" id="yes[% flagloo.name %]" name="[% flagloo.name %]" value="1" checked="checked" />
Lines 1182-1187 Link Here
1182
				[% ELSE %]
1183
				[% ELSE %]
1183
				<input type="radio" id="no[% flagloo.name %]" name="[% flagloo.name %]" value="0" />
1184
				<input type="radio" id="no[% flagloo.name %]" name="[% flagloo.name %]" value="0" />
1184
				[% END %]
1185
				[% END %]
1186
                [% ELSE %]
1187
                  [% IF flagloo.yes %]Yes[% ELSE %]No[% END %]
1188
                [% END %]
1185
1189
1186
            </li>
1190
            </li>
1187
			[% END %]
1191
			[% END %]
Lines 1201-1207 Link Here
1201
                                 <th>Type</th>
1205
                                 <th>Type</th>
1202
                                 <th>Comment</th>
1206
                                 <th>Comment</th>
1203
                                 <th>Expiration</th>
1207
                                 <th>Expiration</th>
1204
                                 <th>Remove?</th>
1208
                                 [% IF CAN_user_borrowers && CAN_user_circulate_manage_restrictions %]
1209
                                   <th>Remove?</th>
1210
                                 [% END %]
1205
                            </tr>
1211
                            </tr>
1206
                        </thead>
1212
                        </thead>
1207
1213
Lines 1211-1224 Link Here
1211
                                    <td>[% d.type %]</td>
1217
                                    <td>[% d.type %]</td>
1212
                                    <td>[% d.comment %]</td>
1218
                                    <td>[% d.comment %]</td>
1213
                                    <td>[% IF d.expiration %] [% d.expiration | $KohaDates %] [% ELSE %] <i>Indefinite</i> [% END %]</td>
1219
                                    <td>[% IF d.expiration %] [% d.expiration | $KohaDates %] [% ELSE %] <i>Indefinite</i> [% END %]</td>
1214
                                    <td>
1220
                                    [% IF CAN_user_borrowers && CAN_user_circulate_manage_restrictions %]
1221
                                      <td>
1215
                                        <input type="checkbox" id="debarment_[% d.borrower_debarment_id %]" name="remove_debarment" value="[% d.borrower_debarment_id %]" />
1222
                                        <input type="checkbox" id="debarment_[% d.borrower_debarment_id %]" name="remove_debarment" value="[% d.borrower_debarment_id %]" />
1216
                                    </td>
1223
                                      </td>
1224
                                    [% END %]
1217
                                </tr>
1225
                                </tr>
1218
                            [% END %]
1226
                            [% END %]
1219
                        </tbody>
1227
                        </tbody>
1220
                    </table>
1228
                    </table>
1221
                [% END %]
1229
                [% END %]
1230
                [% IF CAN_user_borrowers && CAN_user_circulate_manage_restrictions %]
1222
                    <p><a href="#" id="add_manual_restriction">Add manual restriction</a></p>
1231
                    <p><a href="#" id="add_manual_restriction">Add manual restriction</a></p>
1223
                    <fieldset id="manual_restriction_form">
1232
                    <fieldset id="manual_restriction_form">
1224
                        <input type="hidden" id="add_debarment" name="add_debarment" value="1" />
1233
                        <input type="hidden" id="add_debarment" name="add_debarment" value="1" />
Lines 1233-1238 Link Here
1233
                            <a class="cancel" id="cancel_manual_restriction" href="#" onclick="">Cancel</a>
1242
                            <a class="cancel" id="cancel_manual_restriction" href="#" onclick="">Cancel</a>
1234
                        </p>
1243
                        </p>
1235
                    </fieldset>
1244
                    </fieldset>
1245
                [% END %]
1236
            </fieldset>
1246
            </fieldset>
1237
		[% END %]
1247
		[% END %]
1238
1248
1239
- 

Return to bug 10863