Author: jfthomps
Date: Fri Oct 7 19:52:54 2011
New Revision: 1180187
URL: http://svn.apache.org/viewvc?rev=1180187&view=rev
Log:
VCL-513
allow block allocation control per affiliation
updated insert for usergroupprivtype in both files - changed id 2 to be global
block allocation access, added id 13 that is affiliation block allocation access
Modified:
incubator/vcl/trunk/mysql/update-vcl.sql
incubator/vcl/trunk/mysql/vcl.sql
Modified: incubator/vcl/trunk/mysql/update-vcl.sql
URL:
http://svn.apache.org/viewvc/incubator/vcl/trunk/mysql/update-vcl.sql?rev=1180187&r1=1180186&r2=1180187&view=diff
==============================================================================
--- incubator/vcl/trunk/mysql/update-vcl.sql (original)
+++ incubator/vcl/trunk/mysql/update-vcl.sql Fri Oct 7 19:52:54 2011
@@ -652,7 +652,7 @@ INSERT IGNORE INTO resourcetype (id, nam
INSERT IGNORE INTO `usergroupprivtype` (`id`, `name`, `help`) VALUES
(1, 'Manage Additional User Group Permissions', 'This gives users in the group
access to this portion of the site.'),
-(2, 'Manage Block Allocations', 'Grants the ability to create, accept, and
reject block allocations.'),
+(2, 'Manage Block Allocations (global)', 'Grants the ability to create,
accept, and reject block allocations for any affiliation.'),
(3, 'Set Overlapping Reservation Count', 'Grants the ability to control how
many overlapping reservations users in a given user group can make.'),
(4, 'View Debug Information', 'Allows user to see various verbose/debugging
information while using the web site.'),
(5, 'Manage VM Profiles', 'Grants the ability to manage VM profiles under the
Virtual Hosts section of the site.'),
@@ -662,7 +662,8 @@ INSERT IGNORE INTO `usergroupprivtype` (
(9, 'View Dashboard (affiliation only)', 'The dashboard displays real time
information about the VCL system. This option grants access to view the
dashboard with information displayed only about users matching the affiliation
of the currently logged in user.'),
(10, 'User Lookup (global)', 'The User Lookup tool allows a user to see
various information about VCL users. This grants the use of the tool for all
affiliations.'),
(11, 'User Lookup (affiliation only)', 'The User Lookup tool allows a user to
see various information about VCL users. This grants the use of the tool for
looking up users of the same affiliation as the logged in user.'),
-(12, 'View Statistics by Affiliation', 'Grants the ability to see statistics
for affiliations that do not match the affiliation of the logged in user.');
+(12, 'View Statistics by Affiliation', 'Grants the ability to see statistics
for affiliations that do not match the affiliation of the logged in user.'),
+(13, 'Manage Block Allocations (affiliation only)', 'Grants the ability to
create, accept, and reject block allocations owned by users matching your
affiliation.');
-- --------------------------------------------------------
Modified: incubator/vcl/trunk/mysql/vcl.sql
URL:
http://svn.apache.org/viewvc/incubator/vcl/trunk/mysql/vcl.sql?rev=1180187&r1=1180186&r2=1180187&view=diff
==============================================================================
--- incubator/vcl/trunk/mysql/vcl.sql (original)
+++ incubator/vcl/trunk/mysql/vcl.sql Fri Oct 7 19:52:54 2011
@@ -1722,7 +1722,7 @@ INSERT INTO `usergrouppriv` (`usergroupi
INSERT INTO `usergroupprivtype` (`id`, `name`, `help`) VALUES
(1, 'Manage Additional User Group Permissions', 'This gives users in the group
access to this portion of the site.'),
-(2, 'Manage Block Allocations', 'Grants the ability to create, accept, and
reject block allocations.'),
+(2, 'Manage Block Allocations (global)', 'Grants the ability to create,
accept, and reject block allocations for any affiliation.'),
(3, 'Set Overlapping Reservation Count', 'Grants the ability to control how
many overlapping reservations users in a given user group can make.'),
(4, 'View Debug Information', 'Allows user to see various verbose/debugging
information while using the web site.'),
(5, 'Manage VM Profiles', 'Grants the ability to manage VM profiles under the
Virtual Hosts section of the site.'),
@@ -1732,7 +1732,8 @@ INSERT INTO `usergroupprivtype` (`id`, `
(9, 'View Dashboard (affiliation only)', 'The dashboard displays real time
information about the VCL system. This option grants access to view the
dashboard with information displayed only about users matching the affiliation
of the currently logged in user.'),
(10, 'User Lookup (global)', 'The User Lookup tool allows a user to see
various information about VCL users. This grants the use of the tool for all
affiliations.'),
(11, 'User Lookup (affiliation only)', 'The User Lookup tool allows a user to
see various information about VCL users. This grants the use of the tool for
looking up users of the same affiliation as the logged in user.'),
-(12, 'View Statistics by Affiliation', 'Grants the ability to see statistics
for affiliations that do not match the affiliation of the logged in user.');
+(12, 'View Statistics by Affiliation', 'Grants the ability to see statistics
for affiliations that do not match the affiliation of the logged in user.'),
+(13, 'Manage Block Allocations (affiliation only)', 'Grants the ability to
create, accept, and reject block allocations owned by users matching your
affiliation.');
--
-- Dumping data for table `userpriv`
