oqapi/webgui
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

forward porting secondary admin group access privileges when creating users

Browse source
This commit is contained in:
Colin Kuskie 2007-12-11 21:04:21 +00:00
parent ac6651cdcd
commit c44a5a1bb6
2 changed files with 10 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

2
docs/changelog/7.x.x.txt
View file

@ -14,6 +14,8 @@
requestAutoCommit requestAutoCommit
- fix: Some urls cause an asset to be inaccessible after creation/editing (perlDreamer Consulting, LLC.) - fix: Some urls cause an asset to be inaccessible after creation/editing (perlDreamer Consulting, LLC.)
http://www.plainblack.com/bugs/tracker/some-urls-cause-an-asset-to-be-inaccessible-after-creation/editing http://www.plainblack.com/bugs/tracker/some-urls-cause-an-asset-to-be-inaccessible-after-creation/editing
- fix: Secondary Admin can create user with Admin Privilege (IRC:blacksilver)
http://www.plainblack.com/bugs/tracker/secondary-admin-can-create-user-with-admin-privilege
7.4.17 7.4.17
- fix: double width characters encoded incorrectly in Collaboration RSS feed - fix: double width characters encoded incorrectly in Collaboration RSS feed

10
lib/WebGUI/Operation/User.pm
View file

@ -404,12 +404,18 @@ sub www_editUser {
$tabform->getTab("profile")->fieldSetEnd($category->getLabel); $tabform->getTab("profile")->fieldSetEnd($category->getLabel);
} }
my @groupsToAdd = $session->form->group("groupsToAdd"); my @groupsToAdd = $session->form->group("groupsToAdd");
my @exclude = $session->db->buildArray("select groupId from groupings where userId=".$session->db->quote($u->userId)); my @exclude = $session->db->buildArray("select groupId from groupings where userId=?",[$u->userId]);
@exclude = (@exclude,"1","2","7"); @exclude = (@exclude,"1","2","7");
my $secondaryAdmin = $session->user->isInGroup('11');
my @extraExclude = ();
if ($secondaryAdmin && !$session->user->isInGroup(3)) {
@extraExclude = $session->db->buildArray('select groupId from groups where groupId not in (select groupId from groupings where userId=?)',[$session->user->userId]);
}
push @extraExclude, @exclude;
$tabform->getTab("groups")->group( $tabform->getTab("groups")->group(
-name=>"groupsToAdd", -name=>"groupsToAdd",
-label=>$i18n->get("groups to add"), -label=>$i18n->get("groups to add"),
-excludeGroups=>\@exclude, -excludeGroups=>\@extraExclude,
-size=>15, -size=>15,
-multiple=>1, -multiple=>1,
-value=>\@groupsToAdd -value=>\@groupsToAdd