You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@vcl.apache.org by jf...@apache.org on 2014/10/02 21:42:44 UTC
svn commit: r1629056 - in /vcl/trunk/mysql: update-vcl.sql vcl.sql
Author: jfthomps
Date: Thu Oct 2 19:42:44 2014
New Revision: 1629056
URL: http://svn.apache.org/r1629056
Log:
VCL-178 - enable checkuser flag for per reservation instead of image only
vcl.sql:
-added 'Allow No User Check' user group
-added admin user to be member of 'Allow No User Check' user group
update-vcl.sql:
-added stored procedure AddUserGroup - needed it to be a SP because mysql does not let you select from a table (usergroup) (to get values related to the edit user group) when inserting in that table (usergroup)
-added call to AddUserGroup to add 'Allow No User Check' user group
-added insert to add admin user to be member of 'Allow No User Check' user group
Modified:
vcl/trunk/mysql/update-vcl.sql
vcl/trunk/mysql/vcl.sql
Modified: vcl/trunk/mysql/update-vcl.sql
URL: http://svn.apache.org/viewvc/vcl/trunk/mysql/update-vcl.sql?rev=1629056&r1=1629055&r2=1629056&view=diff
==============================================================================
--- vcl/trunk/mysql/update-vcl.sql (original)
+++ vcl/trunk/mysql/update-vcl.sql Thu Oct 2 19:42:44 2014
@@ -685,6 +685,35 @@ BEGIN
END IF;
END$$
+-- --------------------------------------------------------
+
+/*
+Procedure : AddUserGroup
+Parameters : name, grpaffiliation, ownername, owneraffiliation, editgroupname, editaffiliation
+Description : Adds user group named "Allow No User Check"
+*/
+
+DROP PROCEDURE IF EXISTS `AddUserGroup`$$
+CREATE PROCEDURE `AddUserGroup`(
+ IN name tinytext,
+ IN grpaffiliation tinytext,
+ IN ownername tinytext,
+ IN owneraffiliation tinytext,
+ IN editgroupname tinytext,
+ IN editaffiliation tinytext
+)
+BEGIN
+
+ SELECT `affiliation`.id INTO @affiliationid FROM `affiliation` WHERE `affiliation`.`name` = grpaffiliation;
+ SELECT `user`.id INTO @ownerid FROM `user`, `affiliation` WHERE `user`.unityid = ownername AND `user`.affiliationid = affiliation.id AND affiliation.name = owneraffiliation;
+ SELECT `usergroup`.id INTO @editusergroupid FROM `usergroup`, `affiliation` WHERE `usergroup`.name = editgroupname AND `usergroup`.affiliationid = affiliation.id AND affiliation.name = editaffiliation;
+
+ SET @insrt = CONCAT('INSERT IGNORE INTO `usergroup` (`name`, `affiliationid`, `ownerid`, `editusergroupid`, `custom`, `courseroll`, `overlapResCount`) VALUES (', QUOTE(name), ',', @affiliationid, ',', @ownerid, ',', @editusergroupid, ', 1, 0, 0)');
+ PREPARE insrt FROM @insrt;
+ EXECUTE insrt;
+
+END$$
+
/* ============= End of Stored Procedures ===============*/
-- --------------------------------------------------------
@@ -1531,6 +1560,7 @@ INSERT IGNORE INTO state (id, name) VALU
--
UPDATE IGNORE `usergroup` SET `overlapResCount` = '50' WHERE `usergroup`.`name` = 'adminUsers' AND `usergroup`.`overlapResCount` = 0;
+CALL AddUserGroup('Allow No User Check', 'Local', 'admin', 'Local', 'adminUsers', 'Local');
-- --------------------------------------------------------
@@ -1541,7 +1571,8 @@ UPDATE IGNORE `usergroup` SET `overlapRe
INSERT IGNORE INTO `usergroupmembers` (`userid`, `usergroupid`) VALUES
((SELECT `id` FROM `user` WHERE `unityid` = 'admin' AND `affiliationid` = (SELECT `id` FROM `affiliation` WHERE `name` = 'Local')), (SELECT `id` FROM `usergroup` WHERE `name` = 'adminUsers' AND `affiliationid` = (SELECT `id` FROM `affiliation` WHERE `name` = 'Local'))),
((SELECT `id` FROM `user` WHERE `unityid` = 'admin' AND `affiliationid` = (SELECT `id` FROM `affiliation` WHERE `name` = 'Local')), (SELECT `id` FROM `usergroup` WHERE `name` = 'manageNewImages' AND `affiliationid` = (SELECT `id` FROM `affiliation` WHERE `name` = 'Local'))),
-((SELECT `id` FROM `user` WHERE `unityid` = 'admin' AND `affiliationid` = (SELECT `id` FROM `affiliation` WHERE `name` = 'Local')), (SELECT `id` FROM `usergroup` WHERE `name` = 'Specify End Time' AND `affiliationid` = (SELECT `id` FROM `affiliation` WHERE `name` = 'Local')));
+((SELECT `id` FROM `user` WHERE `unityid` = 'admin' AND `affiliationid` = (SELECT `id` FROM `affiliation` WHERE `name` = 'Local')), (SELECT `id` FROM `usergroup` WHERE `name` = 'Specify End Time' AND `affiliationid` = (SELECT `id` FROM `affiliation` WHERE `name` = 'Local'))),
+((SELECT `id` FROM `user` WHERE `unityid` = 'admin' AND `affiliationid` = (SELECT `id` FROM `affiliation` WHERE `name` = 'Local')), (SELECT `id` FROM `usergroup` WHERE `name` = 'Allow No User Check' AND `affiliationid` = (SELECT `id` FROM `affiliation` WHERE `name` = 'Local')));
-- --------------------------------------------------------
Modified: vcl/trunk/mysql/vcl.sql
URL: http://svn.apache.org/viewvc/vcl/trunk/mysql/vcl.sql?rev=1629056&r1=1629055&r2=1629056&view=diff
==============================================================================
--- vcl/trunk/mysql/vcl.sql (original)
+++ vcl/trunk/mysql/vcl.sql Thu Oct 2 19:42:44 2014
@@ -1910,7 +1910,8 @@ INSERT INTO `usergroup` (`id`, `name`, `
(1, 'global', 1, 1, 1, 1, 0, 240, 360, 30, 0),
(3, 'adminUsers', 1, 1, 1, 1, 0, 480, 600, 180, 50),
(4, 'manageNewImages', 1, 1, 3, 1, 0, 240, 360, 30, 0),
-(5, 'Specify End Time', 1, 1, 3, 1, 0, 240, 360, 30, 0);
+(5, 'Specify End Time', 1, 1, 3, 1, 0, 240, 360, 30, 0),
+(6, 'Allow No User Check', 1, 1, 3, 1, 0, 240, 360, 30, 0);
--
-- Dumping data for table `usergroupmembers`
@@ -1920,7 +1921,8 @@ INSERT INTO `usergroupmembers` (`userid`
(1, 1),
(1, 3),
(1, 4),
-(1, 5);
+(1, 5),
+(1, 6);
--
-- Dumping data for table `usergrouppriv`