Bug 14391: Keep parameters_remaining_permissions for now

Since this patch has been written, new references to this
permission have been added to the code:

- t/db_dependent/api/v1/stockrotationstage.t
- t/db_dependent/api/v1/cities.t
- admin/overdrive.pl

Instead of removing the permission, let's keep it for now
and do more clean-up later in separate patches if required.

Signed-off-by: Nick Clemens <nick@bywatersolutions.com>

diff --git a/installer/data/mysql/atomicupdate/bug14391_granular_admin_permissions.sql b/installer/data/mysql/atomicupdate/bug14391_granular_admin_permissions.sql
index 500e883..7aabf7c 100644 (file)
--- a/installer/data/mysql/atomicupdate/bug14391_granular_admin_permissions.sql
+++ b/installer/data/mysql/atomicupdate/bug14391_granular_admin_permissions.sql
@@ -75,8 +75,4 @@ INSERT INTO user_permissions (borrowernumber, module_bit, code)
     WHERE borrowernumber IN
         (SELECT borrowernumber FROM user_permissions WHERE code = 'catalogue');
 
-/* Clean up now obsolete permission */
-DELETE FROM user_permissions WHERE module_bit = 3 and code = 'parameters_remaining_permissions';
-DELETE FROM permissions WHERE module_bit = 3 and code = 'parameters_remaining_permissions';
-
 -- Bug 14391: Add granular permissions to the administration module

diff --git a/installer/data/mysql/userpermissions.sql b/installer/data/mysql/userpermissions.sql
index c2b8c17..cb71d77 100644 (file)
--- a/installer/data/mysql/userpermissions.sql
+++ b/installer/data/mysql/userpermissions.sql
@@ -5,6 +5,7 @@ INSERT INTO permissions (module_bit, code, description) VALUES
    ( 1, 'force_checkout', 'Force checkout if a limitation exists'),
    ( 1, 'manage_restrictions', 'Manage restrictions for accounts'),
    ( 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_from_any_libraries', 'Manage circ rules for any libraries'),
    ( 3, 'manage_sysprefs', 'Manage global system preferences'),