From 7b845866f1b2b8778cf8f3f3f0aa6f78c16b2396 Mon Sep 17 00:00:00 2001 From: Marcel de Rooy Date: Mon, 24 Jun 2013 12:33:58 +0200 Subject: [PATCH] Bug 7368: Followup for columns names in userflags.sql An insert statement should contain the column names to avoid confusion and future problems with table definition changes. I have updated the English default file. Will send updates for the other languages in connection with replacing inserts by updates for the additional languages (where possible). For userflags this will be possible. Test plan: Do an install (English). Or -- as a dangerous(!) alternative--: Do this ONLY on a restorable database. Delete all records in userflags. (Note: This cascades to permissions a.o.) Run this file from command line. Check if you have records again in userflags. (You also messed up your Koha.) Restore your database. Signed-off-by: Marcel de Rooy Tested both ways myself :) Signed-off-by: Bernardo Gonzalez Kriegel Comment: Work as described. No errors. Tested using second alternative Just a note: if you update other lang files replacing INSERTs for UPDATEs then you must install using EN and later apply lang files by hand. If you do a translate first before webinstaller, and finish your install in your lang, then that kind of file will fail. Signed-off-by: Jonathan Druart mysql> create database test; Query OK, 1 row affected (0.00 sec) % mysql -u koha -p test < installer/data/mysql/kohastructure.sql % mysql -u koha -p test < installer/data/mysql/en/mandatory/userflags.sql mysql> select count(*) from userflags; +----------+ | count(*) | +----------+ | 19 | +----------+ 1 row in set (0.00 sec) --- installer/data/mysql/en/mandatory/userflags.sql | 39 ++++++++++++----------- 1 file changed, 20 insertions(+), 19 deletions(-) diff --git a/installer/data/mysql/en/mandatory/userflags.sql b/installer/data/mysql/en/mandatory/userflags.sql index 0714ea4..c00db34 100644 --- a/installer/data/mysql/en/mandatory/userflags.sql +++ b/installer/data/mysql/en/mandatory/userflags.sql @@ -1,19 +1,20 @@ -INSERT INTO `userflags` VALUES(0,'superlibrarian','Access to all librarian functions',0); -INSERT INTO `userflags` VALUES(1,'circulate','Check out and check in items',0); -INSERT INTO `userflags` VALUES(2,'catalogue','Required for staff login. Staff access, allows viewing of catalogue in staff client.',0); -INSERT INTO `userflags` VALUES(3,'parameters','Manage Koha system settings (Administration panel)',0); -INSERT INTO `userflags` VALUES(4,'borrowers','Add or modify patrons',0); -INSERT INTO `userflags` VALUES(5,'permissions','Set user permissions',0); -INSERT INTO `userflags` VALUES(6,'reserveforothers','Place and modify holds for patrons',0); -INSERT INTO `userflags` VALUES(7,'borrow','Borrow books',1); -INSERT INTO `userflags` VALUES(9,'editcatalogue','Edit Catalog (Modify bibliographic/holdings data)',0); -INSERT INTO `userflags` VALUES(10,'updatecharges','Manage patrons fines and fees',0); -INSERT INTO `userflags` VALUES(11,'acquisition','Acquisition and/or suggestion management',0); -INSERT INTO `userflags` VALUES(12,'management','Set library management parameters (deprecated)',0); -INSERT INTO `userflags` VALUES(13,'tools','Use all tools (expand for granular tools permissions)',0); -INSERT INTO `userflags` VALUES(14,'editauthorities','Edit Authorities',0); -INSERT INTO `userflags` VALUES(15,'serials','Manage serial subscriptions',0); -INSERT INTO `userflags` VALUES(16,'reports','Allow access to the reports module',0); -INSERT INTO `userflags` VALUES(17,'staffaccess','Allow staff members to modify permissions for other staff members',0); -INSERT INTO `userflags` VALUES(18,'coursereserves','Course Reserves',0); -INSERT INTO `userflags` VALUES(19, 'plugins', 'Koha plugins', '0'); +INSERT INTO userflags (bit, flag, flagdesc, defaulton) VALUES +(0,'superlibrarian','Access to all librarian functions',0), +(1,'circulate','Check out and check in items',0), +(2,'catalogue','Required for staff login. Staff access, allows viewing of catalogue in staff client.',0), +(3,'parameters','Manage Koha system settings (Administration panel)',0), +(4,'borrowers','Add or modify patrons',0), +(5,'permissions','Set user permissions',0), +(6,'reserveforothers','Place and modify holds for patrons',0), +(7,'borrow','Borrow books',1), +(9,'editcatalogue','Edit Catalog (Modify bibliographic/holdings data)',0), +(10,'updatecharges','Manage patrons fines and fees',0), +(11,'acquisition','Acquisition and/or suggestion management',0), +(12,'management','Set library management parameters (deprecated)',0), +(13,'tools','Use all tools (expand for granular tools permissions)',0), +(14,'editauthorities','Edit Authorities',0), +(15,'serials','Manage serial subscriptions',0), +(16,'reports','Allow access to the reports module',0), +(17,'staffaccess','Allow staff members to modify permissions for other staff members',0), +(18,'coursereserves','Course Reserves',0), +(19, 'plugins', 'Koha plugins', '0'); -- 1.7.10.4