Bugzilla – Attachment 21542 Details for
Bug 10863
Add 2 circulation permissions: force_checkout and lift_restriction
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
Bug 10863: Follow-up: Adding missing permissions to translated files
Bug-10863-Follow-up-Adding-missing-permissions-to-.patch (text/plain), 8.18 KB, created by
Katrin Fischer
on 2013-09-28 10:49:10 UTC
(
hide
)
Description:
Bug 10863: Follow-up: Adding missing permissions to translated files
Filename:
MIME Type:
Creator:
Katrin Fischer
Created:
2013-09-28 10:49:10 UTC
Size:
8.18 KB
patch
obsolete
>From 031797f9c273ecbe1de78aa8efcfe2e6f05c19bc Mon Sep 17 00:00:00 2001 >From: Katrin Fischer <Katrin.Fischer.83@web.de> >Date: Sat, 28 Sep 2013 12:26:27 +0200 >Subject: [PATCH] Bug 10863: Follow-up: Adding missing permissions to > translated files > >This patch adds the 2 new permissions to all remaining sample files. >If the permissions don't get installed, the problem is bigger than >having an English description. > >Also adds back the question "Check out anyway?" for high demand items (HIGHHOLDS). > >Test xt/permissions.t passes now. >--- > .../data/mysql/de-DE/mandatory/userpermissions.sql | 4 +++- > .../data/mysql/es-ES/mandatory/userpermissions.sql | 2 ++ > .../data/mysql/it-IT/necessari/userpermissions.sql | 2 ++ > .../mysql/nb-NO/1-Obligatorisk/userpermissions.sql | 2 ++ > .../data/mysql/pl-PL/mandatory/userpermissions.sql | 2 ++ > .../ru-RU/mandatory/permissions_and_user_flags.sql | 2 ++ > .../uk-UA/mandatory/permissions_and_user_flags.sql | 2 ++ > .../prog/en/modules/circ/circulation.tt | 2 +- > 8 files changed, 16 insertions(+), 2 deletions(-) > >diff --git a/installer/data/mysql/de-DE/mandatory/userpermissions.sql b/installer/data/mysql/de-DE/mandatory/userpermissions.sql >index eb2d48a..9276ac7 100644 >--- a/installer/data/mysql/de-DE/mandatory/userpermissions.sql >+++ b/installer/data/mysql/de-DE/mandatory/userpermissions.sql >@@ -1,7 +1,9 @@ > INSERT INTO permissions (module_bit, code, description) VALUES > ( 1, 'circulate_remaining_permissions', 'Ãbrige Ausleihberechtigungen'), >- ( 1, 'override_renewals', 'Gesperrte Verlängerungen überschreiben'), >+ ( 1, 'override_renewals', 'Vormerksperren übergehen'), > ( 1, 'overdues_report', 'Ãberfälligkeiten-Report ausführen'), >+ ( 1, 'force_checkout', 'Ausleihsperren übergehen'), >+ ( 1, 'lift_restriction', 'Kontosperre "Gesperrt" aufheben'), > ( 3, 'parameters_remaining_permissions', 'Ãbrige Administrationsberechtigungen'), > ( 3, 'manage_circ_rules', 'Ausleihkonditionen verwalten'), > ( 6, 'place_holds', 'Vormerkungen für Benutzer setzen'), >diff --git a/installer/data/mysql/es-ES/mandatory/userpermissions.sql b/installer/data/mysql/es-ES/mandatory/userpermissions.sql >index 4fa2a7a..cf0eb54 100644 >--- a/installer/data/mysql/es-ES/mandatory/userpermissions.sql >+++ b/installer/data/mysql/es-ES/mandatory/userpermissions.sql >@@ -2,6 +2,8 @@ INSERT INTO permissions (module_bit, code, description) VALUES > ( 1, 'circulate_remaining_permissions', 'Remaining circulation permissions'), > ( 1, 'override_renewals', 'Override blocked renewals'), > ( 1, 'overdues_report', 'Execute overdue items report'), >+ ( 1, 'force_checkout', 'Force checkout if a limitation exists'), >+ ( 1, 'lift_restriction', 'Lift restriction for restricted accounts'), > ( 3, 'parameters_remaining_permissions', 'Remaining system parameters permissions'), > ( 3, 'manage_circ_rules', 'manage circulation rules'), > ( 6, 'place_holds', 'Place holds for patrons'), >diff --git a/installer/data/mysql/it-IT/necessari/userpermissions.sql b/installer/data/mysql/it-IT/necessari/userpermissions.sql >index 35f5422..bff76ac 100644 >--- a/installer/data/mysql/it-IT/necessari/userpermissions.sql >+++ b/installer/data/mysql/it-IT/necessari/userpermissions.sql >@@ -4,6 +4,8 @@ INSERT INTO permissions (module_bit, code, description) VALUES > ( 1, 'circulate_remaining_permissions', 'Permessi rimanenti per la circolazione'), > ( 1, 'override_renewals', 'Sblocca i rinnovi bloccati'), > ( 1, 'overdues_report', 'Execute overdue items report'), >+ ( 1, 'force_checkout', 'Force checkout if a limitation exists'), >+ ( 1, 'lift_restriction', 'Lift restriction for restricted accounts'), > ( 3, 'parameters_remaining_permissions', 'Permessi rimanenti'), > ( 3, 'manage_circ_rules', 'Gestisci regole circolazione'), > ( 6, 'place_holds', 'Fai prenotazioni per gli utenti'), >diff --git a/installer/data/mysql/nb-NO/1-Obligatorisk/userpermissions.sql b/installer/data/mysql/nb-NO/1-Obligatorisk/userpermissions.sql >index 5909490..88051d3 100644 >--- a/installer/data/mysql/nb-NO/1-Obligatorisk/userpermissions.sql >+++ b/installer/data/mysql/nb-NO/1-Obligatorisk/userpermissions.sql >@@ -22,6 +22,8 @@ INSERT INTO permissions (module_bit, code, description) VALUES > ( 1, 'circulate_remaining_permissions', 'Ãvrige rettigheter for sirkulasjon'), > ( 1, 'override_renewals', 'Overstyre blokkerte fornyinger'), > ( 1, 'overdues_report', 'Execute overdue items report'), >+ ( 1, 'force_checkout', 'Force checkout if a limitation exists'), >+ ( 1, 'lift_restriction', 'Lift restriction for restricted accounts'), > ( 3, 'parameters_remaining_permissions', 'Ãvrige rettigheter knyttet til systempreferanser'), > ( 3, 'manage_circ_rules', 'Endre sirkulasjonsregler'), > ( 6, 'place_holds', 'Foreta reservering for lÃ¥nere'), >diff --git a/installer/data/mysql/pl-PL/mandatory/userpermissions.sql b/installer/data/mysql/pl-PL/mandatory/userpermissions.sql >index 8428910..c7595f5 100644 >--- a/installer/data/mysql/pl-PL/mandatory/userpermissions.sql >+++ b/installer/data/mysql/pl-PL/mandatory/userpermissions.sql >@@ -2,6 +2,8 @@ INSERT INTO permissions (module_bit, code, description) VALUES > ( 1, 'circulate_remaining_permissions', 'Remaining circulation permissions'), > ( 1, 'override_renewals', 'Override blocked renewals'), > ( 1, 'overdues_report', 'Execute overdue items report'), >+ ( 1, 'force_checkout', 'Force checkout if a limitation exists'), >+ ( 1, 'lift_restriction', 'Lift restriction for restricted accounts'), > ( 3, 'parameters_remaining_permissions', 'Remaining system parameters permissions'), > ( 3, 'manage_circ_rules', 'manage circulation rules'), > ( 6, 'place_holds', 'Place holds for patrons'), >diff --git a/installer/data/mysql/ru-RU/mandatory/permissions_and_user_flags.sql b/installer/data/mysql/ru-RU/mandatory/permissions_and_user_flags.sql >index 046e87b..d315f52 100644 >--- a/installer/data/mysql/ru-RU/mandatory/permissions_and_user_flags.sql >+++ b/installer/data/mysql/ru-RU/mandatory/permissions_and_user_flags.sql >@@ -28,6 +28,8 @@ INSERT INTO permissions (module_bit, code, description) VALUES > ( 1, 'circulate_remaining_permissions', 'Remaining circulation permissions'), > ( 1, 'override_renewals', 'Override blocked renewals'), > ( 1, 'overdues_report', 'Execute overdue items report'), >+ ( 1, 'force_checkout', 'Force checkout if a limitation exists'), >+ ( 1, 'lift_restriction', 'Lift restriction for restricted accounts'), > ( 3, 'parameters_remaining_permissions', 'Remaining system parameters permissions'), > ( 3, 'manage_circ_rules', 'manage circulation rules'), > ( 6, 'place_holds', 'Place holds for patrons'), >diff --git a/installer/data/mysql/uk-UA/mandatory/permissions_and_user_flags.sql b/installer/data/mysql/uk-UA/mandatory/permissions_and_user_flags.sql >index 92e9338..2dc23a0 100644 >--- a/installer/data/mysql/uk-UA/mandatory/permissions_and_user_flags.sql >+++ b/installer/data/mysql/uk-UA/mandatory/permissions_and_user_flags.sql >@@ -28,6 +28,8 @@ INSERT INTO permissions (module_bit, code, description) VALUES > ( 1, 'circulate_remaining_permissions', 'Remaining circulation permissions'), > ( 1, 'override_renewals', 'Override blocked renewals'), > ( 1, 'overdues_report', 'Execute overdue items report'), >+ ( 1, 'force_checkout', 'Force checkout if a limitation exists'), >+ ( 1, 'lift_restriction', 'Lift restriction for restricted accounts'), > ( 3, 'parameters_remaining_permissions', 'Remaining system parameters permissions'), > ( 3, 'manage_circ_rules', 'manage circulation rules'), > ( 6, 'place_holds', 'Place holds for patrons'), >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tt >index 848e7dc..46786ae 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tt >@@ -267,7 +267,7 @@ var MSG_EXPORT_SELECT_CHECKOUTS = _("You must select checkout(s) to export"); > [% END %] > > [% IF HIGHHOLDS %] >- <li>High demand item. Loan period shortened to [% HIGHHOLDS.duration %] days (due [% HIGHHOLDS.returndate %]).</li> >+ <li>High demand item. Loan period shortened to [% HIGHHOLDS.duration %] days (due [% HIGHHOLDS.returndate %]). Check out anyway?</li> > [% END %] > </ul> > >-- >1.7.9.5
You cannot view the attachment while viewing its details because your browser does not support IFRAMEs.
View the attachment on a separate page
.
View Attachment As Diff
View Attachment As Raw
Actions:
View
|
Diff
|
Splinter Review
Attachments on
bug 10863
:
20948
|
20981
|
21042
|
21043
|
21201
|
21203
|
21204
|
21247
|
21248
|
21249
|
21542
|
21661
|
22717
|
23254
|
23540