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

(-)a/installer/data/mysql/de-DE/mandatory/userpermissions.sql (-1 / +1 lines)
Lines 3-9 INSERT INTO permissions (module_bit, code, description) VALUES Link Here
3
   ( 1, 'override_renewals', 'Vormerksperren übergehen'),
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'),
5
   ( 1, 'force_checkout', 'Ausleihsperren übergehen'),
6
   ( 1, 'lift_restriction', 'Kontosperre "Gesperrt" aufheben'),
6
   ( 1, 'manage_restrictions', 'Kontosperre "Gesperrt" aufheben'),
7
   ( 3, 'parameters_remaining_permissions', 'Übrige Administrationsberechtigungen'),
7
   ( 3, 'parameters_remaining_permissions', 'Übrige Administrationsberechtigungen'),
8
   ( 3, 'manage_circ_rules', 'Ausleihkonditionen verwalten'),
8
   ( 3, 'manage_circ_rules', 'Ausleihkonditionen verwalten'),
9
   ( 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 (-1 / +1 lines)
Lines 3-9 INSERT INTO permissions (module_bit, code, description) VALUES Link Here
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'),
5
   ( 1, 'force_checkout', 'Force checkout if a limitation exists'),
6
   ( 1, 'lift_restriction', 'Lift restriction for restricted accounts'),
6
   ( 1, 'manage_restrictions', 'Manage restrictions for accounts'),
7
   ( 3, 'parameters_remaining_permissions', 'Remaining system parameters permissions'),
7
   ( 3, 'parameters_remaining_permissions', 'Remaining system parameters permissions'),
8
   ( 3, 'manage_circ_rules', 'manage circulation rules'),
8
   ( 3, 'manage_circ_rules', 'manage circulation rules'),
9
   ( 6, 'place_holds', 'Place holds for patrons'),
9
   ( 6, 'place_holds', 'Place holds for patrons'),
(-)a/installer/data/mysql/es-ES/mandatory/userpermissions.sql (-1 / +1 lines)
Lines 3-9 INSERT INTO permissions (module_bit, code, description) VALUES Link Here
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'),
5
   ( 1, 'force_checkout', 'Force checkout if a limitation exists'),
6
   ( 1, 'lift_restriction', 'Lift restriction for restricted accounts'),
6
   ( 1, 'manage_restrictions', 'Manage restrictions for accounts'),
7
   ( 3, 'parameters_remaining_permissions', 'Remaining system parameters permissions'),
7
   ( 3, 'parameters_remaining_permissions', 'Remaining system parameters permissions'),
8
   ( 3, 'manage_circ_rules', 'manage circulation rules'),
8
   ( 3, 'manage_circ_rules', 'manage circulation rules'),
9
   ( 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 (-1 / +1 lines)
Lines 3-9 INSERT INTO permissions (module_bit, code, description) VALUES Link Here
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'),
5
   ( 1, 'force_checkout', 'Forcer le prêt si une limitation existe'),
6
   ( 1, 'lift_restriction', 'Lever la suspenssion d\'un utilisateur suspendu'),
6
   ( 1, 'manage_restrictions', 'Gérer les suspensions d\'un utilisateur'),
7
   ( 3, 'parameters_remaining_permissions', 'Paramètres du système restants'),
7
   ( 3, 'parameters_remaining_permissions', 'Paramètres du système restants'),
8
   ( 3, 'manage_circ_rules', 'Gestion des règles de circulation'),
8
   ( 3, 'manage_circ_rules', 'Gestion des règles de circulation'),
9
   ( 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 (-1 / +1 lines)
Lines 5-11 INSERT INTO permissions (module_bit, code, description) VALUES Link Here
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'),
7
   ( 1, 'force_checkout', 'Force checkout if a limitation exists'),
8
   ( 1, 'lift_restriction', 'Lift restriction for restricted accounts'),
8
   ( 1, 'manage_restrictions', 'Manage restrictions for accounts'),
9
   ( 3, 'parameters_remaining_permissions', 'Permessi rimanenti'),
9
   ( 3, 'parameters_remaining_permissions', 'Permessi rimanenti'),
10
   ( 3, 'manage_circ_rules', 'Gestisci regole circolazione'),
10
   ( 3, 'manage_circ_rules', 'Gestisci regole circolazione'),
11
   ( 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 (-1 / +1 lines)
Lines 23-29 INSERT INTO permissions (module_bit, code, description) VALUES Link Here
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'),
25
   ( 1, 'force_checkout', 'Force checkout if a limitation exists'),
26
   ( 1, 'lift_restriction', 'Lift restriction for restricted accounts'),
26
   ( 1, 'manage_restrictions', 'Manage restrictions for accounts'),
27
   ( 3, 'parameters_remaining_permissions', 'Øvrige rettigheter knyttet til systempreferanser'),
27
   ( 3, 'parameters_remaining_permissions', 'Øvrige rettigheter knyttet til systempreferanser'),
28
   ( 3, 'manage_circ_rules', 'Endre sirkulasjonsregler'),
28
   ( 3, 'manage_circ_rules', 'Endre sirkulasjonsregler'),
29
   ( 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 (-1 / +1 lines)
Lines 3-9 INSERT INTO permissions (module_bit, code, description) VALUES Link Here
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'),
5
   ( 1, 'force_checkout', 'Force checkout if a limitation exists'),
6
   ( 1, 'lift_restriction', 'Lift restriction for restricted accounts'),
6
   ( 1, 'manage_restrictions', 'Manage restrictions for accounts'),
7
   ( 3, 'parameters_remaining_permissions', 'Remaining system parameters permissions'),
7
   ( 3, 'parameters_remaining_permissions', 'Remaining system parameters permissions'),
8
   ( 3, 'manage_circ_rules', 'manage circulation rules'),
8
   ( 3, 'manage_circ_rules', 'manage circulation rules'),
9
   ( 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 (-1 / +1 lines)
Lines 29-35 INSERT INTO permissions (module_bit, code, description) VALUES Link Here
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'),
31
   ( 1, 'force_checkout', 'Force checkout if a limitation exists'),
32
   ( 1, 'lift_restriction', 'Lift restriction for restricted accounts'),
32
   ( 1, 'manage_restrictions', 'Manage restrictions for accounts'),
33
   ( 3, 'parameters_remaining_permissions', 'Remaining system parameters permissions'),
33
   ( 3, 'parameters_remaining_permissions', 'Remaining system parameters permissions'),
34
   ( 3, 'manage_circ_rules', 'manage circulation rules'),
34
   ( 3, 'manage_circ_rules', 'manage circulation rules'),
35
   ( 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 (-1 / +1 lines)
Lines 29-35 INSERT INTO permissions (module_bit, code, description) VALUES Link Here
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'),
31
   ( 1, 'force_checkout', 'Force checkout if a limitation exists'),
32
   ( 1, 'lift_restriction', 'Lift restriction for restricted accounts'),
32
   ( 1, 'manage_restrictions', 'Manage restrictions for accounts'),
33
   ( 3, 'parameters_remaining_permissions', 'Remaining system parameters permissions'),
33
   ( 3, 'parameters_remaining_permissions', 'Remaining system parameters permissions'),
34
   ( 3, 'manage_circ_rules', 'manage circulation rules'),
34
   ( 3, 'manage_circ_rules', 'manage circulation rules'),
35
   ( 6, 'place_holds', 'Place holds for patrons'),
35
   ( 6, 'place_holds', 'Place holds for patrons'),
(-)a/installer/data/mysql/updatedatabase.pl (-3 / +3 lines)
Lines 7161-7167 if ( CheckVersion($DBversion) ) { Link Here
7161
        INSERT INTO permissions (module_bit, code, description) VALUES ( 1, 'force_checkout', 'Force checkout if a limitation exists')
7161
        INSERT INTO permissions (module_bit, code, description) VALUES ( 1, 'force_checkout', 'Force checkout if a limitation exists')
7162
    });
7162
    });
7163
    $dbh->do(q{
7163
    $dbh->do(q{
7164
        INSERT INTO permissions (module_bit, code, description) VALUES ( 1, 'lift_restriction', 'Lift restriction for restricted accounts')
7164
        INSERT INTO permissions (module_bit, code, description) VALUES ( 1, 'manage_restrictions', 'Lift restriction for restricted accounts')
7165
    });
7165
    });
7166
    $dbh->do(q{
7166
    $dbh->do(q{
7167
        INSERT INTO user_permissions (borrowernumber, module_bit, code)
7167
        INSERT INTO user_permissions (borrowernumber, module_bit, code)
Lines 7172-7184 if ( CheckVersion($DBversion) ) { Link Here
7172
    });
7172
    });
7173
    $dbh->do(q{
7173
    $dbh->do(q{
7174
        INSERT INTO user_permissions (borrowernumber, module_bit, code)
7174
        INSERT INTO user_permissions (borrowernumber, module_bit, code)
7175
            SELECT user_permissions.borrowernumber, 1, 'lift_restriction'
7175
            SELECT user_permissions.borrowernumber, 1, 'manage_restrictions'
7176
            FROM user_permissions
7176
            FROM user_permissions
7177
            LEFT JOIN borrowers USING(borrowernumber)
7177
            LEFT JOIN borrowers USING(borrowernumber)
7178
            WHERE borrowers.flags & (1 << 1)
7178
            WHERE borrowers.flags & (1 << 1)
7179
    });
7179
    });
7180
7180
7181
    print "Upgrade to $DBversion done (Bug 10863 - Add permission force_checkout and lift_restriction)\n";
7181
    print "Upgrade to $DBversion done (Bug 10863 - Add permission force_checkout and manage_restrictions)\n";
7182
    SetVersion($DBversion);
7182
    SetVersion($DBversion);
7183
}
7183
}
7184
7184
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tt (-1 / +1 lines)
Lines 583-589 No patron matched <span class="ex">[% message %]</span> Link Here
583
            [% IF ( userdebarred ) %]
583
            [% IF ( userdebarred ) %]
584
               <li class="blocker">
584
               <li class="blocker">
585
               <span class="circ-hlt"> Restricted:</span> Patron's account is restricted [% IF (userdebarreddate ) %] until [% userdebarreddate %] [% END %] [% IF (debarredcomment ) %] with the comment "[% debarredcomment %]"[% END %]
585
               <span class="circ-hlt"> Restricted:</span> Patron's account is restricted [% IF (userdebarreddate ) %] until [% userdebarreddate %] [% END %] [% IF (debarredcomment ) %] with the comment "[% debarredcomment %]"[% END %]
586
               [% IF CAN_user_circulate_lift_restriction %]
586
               [% IF CAN_user_circulate_manage_restrictions %]
587
               <form class="inline compact" action="/cgi-bin/koha/members/setstatus.pl" method="post">
587
               <form class="inline compact" action="/cgi-bin/koha/members/setstatus.pl" method="post">
588
	                <input type="hidden" name="borrowernumber" value="[% borrowernumber %]" />
588
	                <input type="hidden" name="borrowernumber" value="[% borrowernumber %]" />
589
	                <input type="hidden" name="destination" value="circ" />
589
	                <input type="hidden" name="destination" value="circ" />
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/members/memberentrygen.tt (-4 / +14 lines)
Lines 1145-1150 Link Here
1145
				[% IF ( flagloo.key == 'debarred' ) %]Restricted:[% END %]
1145
				[% IF ( flagloo.key == 'debarred' ) %]Restricted:[% END %]
1146
                [% IF ( flagloo.key == 'lost' ) %]Lost card:[% END %]
1146
                [% IF ( flagloo.key == 'lost' ) %]Lost card:[% END %]
1147
                </label>
1147
                </label>
1148
                [% IF CAN_user_circulate_manage_restrictions %]
1148
				<label for="yes[% flagloo.name %]">Yes </label>
1149
				<label for="yes[% flagloo.name %]">Yes </label>
1149
				[% IF ( flagloo.yes ) %]
1150
				[% IF ( flagloo.yes ) %]
1150
				<input type="radio" id="yes[% flagloo.name %]" name="[% flagloo.name %]" value="1" checked="checked" />
1151
				<input type="radio" id="yes[% flagloo.name %]" name="[% flagloo.name %]" value="1" checked="checked" />
Lines 1157-1168 Link Here
1157
				[% ELSE %]
1158
				[% ELSE %]
1158
				<input type="radio" id="no[% flagloo.name %]" name="[% flagloo.name %]" value="0" />
1159
				<input type="radio" id="no[% flagloo.name %]" name="[% flagloo.name %]" value="0" />
1159
				[% END %]
1160
				[% END %]
1161
                [% ELSE %]
1162
                  [% IF flagloo.yes %]Yes[% ELSE %]No[% END %]
1163
                [% END %]
1160
1164
1161
            </li>
1165
            </li>
1162
			[% END %]
1166
			[% END %]
1163
            <li>
1167
            <li>
1164
                <label for="yesdebarred" class="radio">Restricted: </label>
1168
                <label for="yesdebarred" class="radio">Restricted: </label>
1165
                [% IF CAN_user_circulate_lift_restriction %]
1169
                [% IF CAN_user_circulate_manage_restrictions %]
1166
                  [% IF ( debarred ) %]
1170
                  [% IF ( debarred ) %]
1167
                  <label for="yesdebarred">Yes </label>
1171
                  <label for="yesdebarred">Yes </label>
1168
                    <input type="radio" id="yesdebarred" name="debarred" value="1" checked="checked"/>
1172
                    <input type="radio" id="yesdebarred" name="debarred" value="1" checked="checked"/>
Lines 1179-1193 Link Here
1179
                  <span class="hint">(optional)</span> </span>
1183
                  <span class="hint">(optional)</span> </span>
1180
                [% ELSE %]
1184
                [% ELSE %]
1181
                  [% IF ( debarred ) %]
1185
                  [% IF ( debarred ) %]
1182
                    Yes, until [% datedebarred %]
1186
                    Yes[% IF datedebarred %], until [% datedebarred %][% END %]
1183
                  [% ELSE %]
1187
                  [% ELSE %]
1184
                    No
1188
                    No
1185
                  [% END %]
1189
                  [% END %]
1186
                [% END %]
1190
                [% END %]
1187
                </li>
1191
                </li>
1188
                <li>
1192
                <li>
1189
		        <label for="debarredcomment" class="radio">Comment:</label>
1193
                [% IF CAN_user_circulate_manage_restrictions || debarredcomment %]
1190
                <textarea id="debarredcomment" name="debarredcomment" cols="55" rows="3">[% debarredcomment %]</textarea>
1194
                  <label for="debarredcomment" class="radio">Comment:</label>
1195
                  [% IF CAN_user_circulate_manage_restrictions %]
1196
                    <textarea id="debarredcomment" name="debarredcomment" cols="55" rows="3">[% debarredcomment %]</textarea>
1197
                  [% ELSE %]
1198
                    [% debarredcomment %]
1199
                  [% END %]
1200
                [% END %]
1191
	        </li>
1201
	        </li>
1192
1202
1193
			</ol>
1203
			</ol>
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember.tt (-2 / +1 lines)
Lines 194-200 function validate1(date) { Link Here
194
        <ul>
194
        <ul>
195
        [% IF ( userdebarred ) %]
195
        [% IF ( userdebarred ) %]
196
            <li class="blocker">Patron is restricted[% IF ( userdebarreddate ) %] until [% userdebarreddate%] [% IF (debarredcomment ) %]([% debarredcomment %])[% END %][% END %]
196
            <li class="blocker">Patron is restricted[% IF ( userdebarreddate ) %] until [% userdebarreddate%] [% IF (debarredcomment ) %]([% debarredcomment %])[% END %][% END %]
197
            [% IF CAN_user_circulate_lift_restriction %]
197
            [% IF CAN_user_circulate_manage_restrictions %]
198
              <form class="inline compact" action="/cgi-bin/koha/members/setdebar.pl" method="post">
198
              <form class="inline compact" action="/cgi-bin/koha/members/setdebar.pl" method="post">
199
                <input type="hidden" name="borrowernumber" value="[% borrowernumber %]" />
199
                <input type="hidden" name="borrowernumber" value="[% borrowernumber %]" />
200
                <input type="submit" value="Lift restriction" />
200
                <input type="submit" value="Lift restriction" />
201
- 

Return to bug 10863