From 8b6be7cced077e587c00a43080efc548b48fefac Mon Sep 17 00:00:00 2001 From: Nick Date: Wed, 2 Oct 2019 13:28:39 +0000 Subject: [PATCH] Bug 17268: Add macros table and permissions Signed-off-by: Andrew Fuerste-Henry Signed-off-by: Heather Hernandez Signed-off-by: Katrin Fischer Signed-off-by: Martin Renvoize --- .../bug_17268_add_macros_table.perl | 27 +++++++++++++++++++ installer/data/mysql/kohastructure.sql | 15 +++++++++++ installer/data/mysql/userpermissions.sql | 2 ++ .../prog/en/includes/permissions.inc | 10 +++++++ 4 files changed, 54 insertions(+) create mode 100644 installer/data/mysql/atomicupdate/bug_17268_add_macros_table.perl diff --git a/installer/data/mysql/atomicupdate/bug_17268_add_macros_table.perl b/installer/data/mysql/atomicupdate/bug_17268_add_macros_table.perl new file mode 100644 index 0000000000..04b9728e19 --- /dev/null +++ b/installer/data/mysql/atomicupdate/bug_17268_add_macros_table.perl @@ -0,0 +1,27 @@ +$DBversion = 'XXX'; # will be replaced by the RM +if( CheckVersion( $DBversion ) ) { + unless ( TableExists('advanced_editor_macros') ) { + $dbh->do(q| + CREATE TABLE advanced_editor_macros ( + id INT(11) NOT NULL AUTO_INCREMENT, + name varchar(80) NOT NULL, + macro longtext NULL, + borrowernumber INT(11) default NULL, + shared TINYINT(1) default 0, + PRIMARY KEY (id), + CONSTRAINT borrower_macro_fk FOREIGN KEY ( borrowernumber ) REFERENCES borrowers ( borrowernumber ) ON UPDATE CASCADE ON DELETE CASCADE + ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci;| + ); + } + $dbh->do(q| + INSERT IGNORE INTO permissions (module_bit, code, description) + VALUES (9, 'create_shared_macros', 'Create public macros') + |); + $dbh->do(q| + INSERT IGNORE INTO permissions (module_bit, code, description) + VALUES (9, 'delete_shared_macros', 'Delete public macros') + |); + + SetVersion( $DBversion ); + print "Upgrade to $DBversion done (Bug 17682 - Add macros db table and permissions)\n"; +} diff --git a/installer/data/mysql/kohastructure.sql b/installer/data/mysql/kohastructure.sql index 3e3829bc37..2771d403e3 100644 --- a/installer/data/mysql/kohastructure.sql +++ b/installer/data/mysql/kohastructure.sql @@ -4476,6 +4476,21 @@ CREATE TABLE `problem_reports` ( CONSTRAINT `problem_reports_ibfk2` FOREIGN KEY (`branchcode`) REFERENCES `branches` (`branchcode`) ON DELETE CASCADE ON UPDATE CASCADE ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci; +-- +-- Table structure for table advanced_editor_macros +-- + +DROP TABLE IF EXISTS advanced_editor_macros; +CREATE TABLE advanced_editor_macros ( + id INT(11) NOT NULL AUTO_INCREMENT, -- Unique ID of the macro + name varchar(80) NOT NULL, -- Name of the macro + macro longtext NULL, -- The macro code itself + borrowernumber INT(11) default NULL, -- ID of the borrower who created this macro + shared TINYINT(1) default 0, -- Bit to define if shared or private macro + PRIMARY KEY (id), + CONSTRAINT borrower_macro_fk FOREIGN KEY ( borrowernumber ) REFERENCES borrowers ( borrowernumber ) ON UPDATE CASCADE ON DELETE CASCADE +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci; + /*!40103 SET TIME_ZONE=@OLD_TIME_ZONE */; /*!40101 SET SQL_MODE=@OLD_SQL_MODE */; /*!40014 SET FOREIGN_KEY_CHECKS=@OLD_FOREIGN_KEY_CHECKS */; diff --git a/installer/data/mysql/userpermissions.sql b/installer/data/mysql/userpermissions.sql index a79e48c6ff..f90eee99a7 100644 --- a/installer/data/mysql/userpermissions.sql +++ b/installer/data/mysql/userpermissions.sql @@ -41,6 +41,8 @@ INSERT INTO permissions (module_bit, code, description) VALUES ( 9, 'edit_catalogue', 'Edit catalog (Modify bibliographic/holdings data)'), ( 9, 'fast_cataloging', 'Fast cataloging'), ( 9, 'advanced_editor', 'Use the advanced cataloging editor (requires edit_catalogue)'), + ( 9, 'create_shared_macros', 'Create shared macros'), + ( 9, 'delete_shared_macros', 'Delete shared macros'), ( 9, 'edit_items', 'Edit items'), ( 9, 'edit_items_restricted', 'Limit item modification to subfields defined in the SubfieldsToAllowForRestrictedEditing preference (please note that edit_item is still required)'), ( 9, 'delete_all_items', 'Delete all items at once'), diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/permissions.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/permissions.inc index 1179537930..368202b7cc 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/includes/permissions.inc +++ b/koha-tmpl/intranet-tmpl/prog/en/includes/permissions.inc @@ -290,6 +290,16 @@ Use the advanced cataloging editor (requires edit_catalogue) ([% name | html %]) + [%- CASE 'create_shared_macros' -%] + + Create shared macros (requires advanced_editor) + + ([% name | html %]) + [%- CASE 'delete_shared_macros' -%] + + Delete shared macros (requires advanced_editor) + + ([% name | html %]) [%- CASE 'edit_items' -%] Edit items -- 2.39.5