From 1b5ed6f2ae52a0d1c22cf971b4ba24e1b80c9d25 Mon Sep 17 00:00:00 2001 From: Andrew Isherwood Date: Tue, 1 Oct 2019 16:03:58 +0100 Subject: [PATCH] Bug 23681: Add modify_patron_restrictions perm This patch adds a new "modify_patron_restrictions" permission --- .../atomicupdate/bug_23681_add_debarment_types.perl | 16 ++++++++-------- .../bug_23681_add_manage_patron_restrictions_perm.perl | 9 +++++++++ installer/data/mysql/userpermissions.sql | 1 + koha-tmpl/intranet-tmpl/prog/en/includes/permissions.inc | 5 +++++ .../intranet-tmpl/prog/en/modules/admin/admin-home.tt | 4 ++++ 5 files changed, 27 insertions(+), 8 deletions(-) create mode 100644 installer/data/mysql/atomicupdate/bug_23681_add_manage_patron_restrictions_perm.perl diff --git a/installer/data/mysql/atomicupdate/bug_23681_add_debarment_types.perl b/installer/data/mysql/atomicupdate/bug_23681_add_debarment_types.perl index 4fc862c954..0050b230eb 100644 --- a/installer/data/mysql/atomicupdate/bug_23681_add_debarment_types.perl +++ b/installer/data/mysql/atomicupdate/bug_23681_add_debarment_types.perl @@ -18,15 +18,15 @@ if ( CheckVersion( $DBversion ) ) { ('SUSPENSION', 'Suspension', 1, 0), ('DISCHARGE', 'Discharge', 1, 0); |); + $dbh->do( q| + ALTER TABLE borrower_debarments + MODIFY COLUMN type varchar(50) NOT NULL + | ); + $dbh->do( q| + ALTER TABLE borrower_debarments + ADD CONSTRAINT borrower_debarments_ibfk_2 FOREIGN KEY (type) REFERENCES debarment_types(code) ON DELETE NO ACTION ON UPDATE CASCADE; + | ); } - $dbh->do( q| - ALTER TABLE borrower_debarments - MODIFY COLUMN type varchar(50) NOT NULL - | ); - $dbh->do( q| - ALTER TABLE borrower_debarments - ADD CONSTRAINT borrower_debarments_ibfk_2 FOREIGN KEY (type) REFERENCES debarment_types(code) ON DELETE NO ACTION ON UPDATE CASCADE; - | ); SetVersion( $DBversion ); print "Upgrade to $DBversion done (Bug 23681 - Add debarment_types)\n"; diff --git a/installer/data/mysql/atomicupdate/bug_23681_add_manage_patron_restrictions_perm.perl b/installer/data/mysql/atomicupdate/bug_23681_add_manage_patron_restrictions_perm.perl new file mode 100644 index 0000000000..283791ba8a --- /dev/null +++ b/installer/data/mysql/atomicupdate/bug_23681_add_manage_patron_restrictions_perm.perl @@ -0,0 +1,9 @@ +$DBversion = 'XXX'; +if( CheckVersion( $DBversion ) ) { + $dbh->do(q{ + INSERT IGNORE INTO permissions (module_bit, code, description) VALUES + ( 3, 'manage_patron_restrictions', 'Manage patron restrictions') + }); + SetVersion( $DBversion ); + print "Upgrade to $DBversion done (Bug 23681 - Add manage_patron_restrictions_permission)\n"; +} diff --git a/installer/data/mysql/userpermissions.sql b/installer/data/mysql/userpermissions.sql index d9caa0e454..3260a5fe12 100644 --- a/installer/data/mysql/userpermissions.sql +++ b/installer/data/mysql/userpermissions.sql @@ -17,6 +17,7 @@ INSERT INTO permissions (module_bit, code, description) VALUES ( 3, 'manage_transfers', 'Manage library transfer limits and transport cost matrix'), ( 3, 'manage_item_circ_alerts', 'Manage item circulation alerts'), ( 3, 'manage_cities', 'Manage cities and towns'), + ( 3, 'manage_patron_restrictions', 'Manage patron restrictions'), ( 3, 'manage_marc_frameworks', 'Manage MARC bibliographic and authority frameworks'), ( 3, 'manage_classifications', 'Manage classification sources'), ( 3, 'manage_matching_rules', 'Manage record matching rules'), diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/permissions.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/permissions.inc index e3faeddbba..c995edcb92 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/includes/permissions.inc +++ b/koha-tmpl/intranet-tmpl/prog/en/includes/permissions.inc @@ -149,6 +149,11 @@ Manage patron categories ([% name | html %]) + [%- CASE 'manage_patron_restrictions' -%] + + Manage patron restrictions + + ([% name | html %]) [%- CASE 'manage_patron_attributes' -%] Manage extended patron attributes diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/admin-home.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/admin-home.tt index 4095e516e9..d0df67071f 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/admin-home.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/admin-home.tt @@ -95,6 +95,10 @@
Cities and towns
Define cities and towns that your patrons live in.
[% END %] + [% IF ( CAN_user_parameters_manage_patron_restrictions ) %] +
Patron restrictions
+
Define patron restrictions.
+ [% END %] [% END %] -- 2.11.0