@@ -, +, @@ --- .../bug_23681_add_debarment_types.perl | 6 +++--- .../en/mandatory/patron_restrictions.sql | 2 +- installer/data/mysql/kohastructure.sql | 4 ++-- .../prog/en/modules/admin/restrictions.tt | 4 ++-- t/db_dependent/RestrictionType.t | 16 +++++++-------- t/db_dependent/RestrictionTypes.t | 20 +++++++++---------- 6 files changed, 26 insertions(+), 26 deletions(-) --- a/installer/data/mysql/atomicupdate/bug_23681_add_debarment_types.perl +++ a/installer/data/mysql/atomicupdate/bug_23681_add_debarment_types.perl @@ -7,12 +7,12 @@ if ( CheckVersion( $DBversion ) ) { CREATE TABLE debarment_types ( code varchar(50) NOT NULL PRIMARY KEY, display_text text NOT NULL, - ronly tinyint(1) NOT NULL DEFAULT 0, - dflt tinyint(1) NOT NULL DEFAULT 0 + readonly tinyint(1) NOT NULL DEFAULT 0, + system tinyint(1) NOT NULL DEFAULT 0 ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci; | ); $dbh->do( q| - INSERT INTO debarment_types (code, display_text, ronly, dflt) VALUES + INSERT INTO debarment_types (code, display_text, readonly, system) VALUES ('MANUAL', 'Manual', 1, 1), ('OVERDUES', 'Overdues', 1, 0), ('SUSPENSION', 'Suspension', 1, 0), --- a/installer/data/mysql/en/mandatory/patron_restrictions.sql +++ a/installer/data/mysql/en/mandatory/patron_restrictions.sql @@ -1,4 +1,4 @@ -INSERT INTO debarment_types (code, display_text, ronly, dflt) VALUES +INSERT INTO debarment_types (code, display_text, readonly, system) VALUES ('MANUAL', 'Manual', 1, 1), ('OVERDUES', 'Overdues', 1, 0), ('SUSPENSION', 'Suspension', 1, 0), --- a/installer/data/mysql/kohastructure.sql +++ a/installer/data/mysql/kohastructure.sql @@ -2015,8 +2015,8 @@ DROP TABLE IF EXISTS `debarment_types`; CREATE TABLE debarment_types ( code varchar(50) NOT NULL PRIMARY KEY, display_text text NOT NULL, - ronly tinyint(1) NOT NULL DEFAULT 0, - dflt tinyint(1) NOT NULL DEFAULT 0 + readonly tinyint(1) NOT NULL DEFAULT 0, + is_system tinyint(1) NOT NULL DEFAULT 0 ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci; -- --- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/restrictions.tt +++ a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/restrictions.tt @@ -170,11 +170,11 @@ [% restriction.display_text | html %]