@@ -, +, @@
manage_circ_rules_from_any_libraries
---
admin/smart-rules.pl | 9 +++++----
.../atomicupdate/bug_15520-add_manage_circ_rules_restricted.sql | 2 +-
installer/data/mysql/userpermissions.sql | 2 +-
koha-tmpl/intranet-tmpl/prog/en/includes/permissions.inc | 2 +-
4 files changed, 8 insertions(+), 7 deletions(-)
--- a/admin/smart-rules.pl
+++ a/admin/smart-rules.pl
@@ -61,10 +61,11 @@ unless ( $branch ) {
}
}
-my $uid = Koha::Patrons->find( $loggedinuser )->userid;
-my $restricted_to_own_library = $uid && haspermission( $uid, { parameters => 'manage_circ_rules_restricted' }, { no_inherit => 1 } );
-$template->param( restricted_to_own_library => $restricted_to_own_library );
-$branch = C4::Context::mybranch() if $restricted_to_own_library;
+my $logged_in_patron = Koha::Patrons->find( $loggedinuser );
+
+my $can_edit_from_any_library = $logged_in_patron->has_permission( {parameters => 'manage_circ_rules_from_any_libraries' } );
+$template->param( restricted_to_own_library => not $can_edit_from_any_library );
+$branch = C4::Context::mybranch() unless $can_edit_from_any_library;
$branch = '*' if $branch eq 'NO_LIBRARY_SET';
--- a/installer/data/mysql/atomicupdate/bug_15520-add_manage_circ_rules_restricted.sql
+++ a/installer/data/mysql/atomicupdate/bug_15520-add_manage_circ_rules_restricted.sql
@@ -1, +1, @@
-INSERT IGNORE INTO `permissions` (module_bit, code, description) VALUES(3, 'manage_circ_rules_restricted', 'Only manage circ rules for own library');
+INSERT IGNORE INTO `permissions` (module_bit, code, description) VALUES(3, 'manage_circ_rules_from_any_libraries', 'Manage circ rules for any libraries');
--- a/installer/data/mysql/userpermissions.sql
+++ a/installer/data/mysql/userpermissions.sql
@@ -7,7 +7,7 @@ INSERT INTO permissions (module_bit, code, description) VALUES
( 1, 'manage_checkout_notes', 'Mark checkout notes as seen/not seen'),
( 3, 'parameters_remaining_permissions', 'Remaining system parameters permissions'),
( 3, 'manage_circ_rules', 'Manage circulation rules'),
- ( 3, 'manage_circ_rules_restricted', 'Only manage circ rules for own library'),
+ ( 3, 'manage_circ_rules_restricted', 'Manage circ rules for any libraries'),
( 4, 'edit_borrowers', 'Add, modify and view patron information'),
( 4, 'view_borrower_infos_from_any_libraries', 'View patron infos from any libraries'),
( 6, 'place_holds', 'Place holds for patrons'),
--- a/koha-tmpl/intranet-tmpl/prog/en/includes/permissions.inc
+++ a/koha-tmpl/intranet-tmpl/prog/en/includes/permissions.inc
@@ -33,7 +33,7 @@
[%- CASE 'override_renewals' -%]Override blocked renewals
[%- CASE 'manage_checkout_notes' %]Mark checkout notes as seen/not seen
[%- CASE 'manage_circ_rules' -%]manage circulation rules
- [%- CASE 'manage_circ_rules_restricted' -%]Limit circulation rules editing to the user's own library (please note that manage_circ_rules is still required)
+ [%- CASE 'manage_circ_rules_from_any_libraries' -%]Edit circulation rules from any libraries. If not set the logged in user could only edit circulation rules for its the own library (please note that manage_circ_rules is still required)
[%- CASE 'parameters_remaining_permissions' -%]Remaining system parameters permissions
[%- CASE 'edit_borrowers' -%]Add, modify and view patron information
[%- CASE 'view_borrower_infos_from_any_libraries' -%]View patron infos from any libraries. If not set the logged in user could only access patron infos from its own library or group of libraries.
--