From 02a05034651da007dc31ffc791ee0e7e70c3df06 Mon Sep 17 00:00:00 2001 From: nbm Date: Thu, 21 Jul 2005 15:59:03 +0000 Subject: [PATCH] User GroupUtil::listGroupsForUser instead of playing with Link objects. --- presentation/lookAndFeel/knowledgeTree/administration/usermanagement/editUserGroupsBL.php | 2 +- presentation/lookAndFeel/knowledgeTree/administration/usermanagement/editUserGroupsUI.inc | 9 +++++++-- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/presentation/lookAndFeel/knowledgeTree/administration/usermanagement/editUserGroupsBL.php b/presentation/lookAndFeel/knowledgeTree/administration/usermanagement/editUserGroupsBL.php index 1177ab6..3863c71 100644 --- a/presentation/lookAndFeel/knowledgeTree/administration/usermanagement/editUserGroupsBL.php +++ b/presentation/lookAndFeel/knowledgeTree/administration/usermanagement/editUserGroupsBL.php @@ -61,8 +61,8 @@ if (checkSession()) { require_once("$default->fileSystemRoot/lib/visualpatterns/PatternCreate.inc"); require_once("editUserGroupsUI.inc"); require_once("$default->fileSystemRoot/lib/groups/Group.inc"); + require_once("$default->fileSystemRoot/lib/groups/GroupUtil.php"); require_once("$default->fileSystemRoot/lib/users/User.inc"); - require_once("$default->fileSystemRoot/lib/groups/GroupUserLink.inc"); require_once("$default->fileSystemRoot/lib/security/Permission.inc"); require_once("$default->fileSystemRoot/presentation/webpageTemplate.inc"); require_once("$default->fileSystemRoot/lib/visualpatterns/PatternCustom.inc"); diff --git a/presentation/lookAndFeel/knowledgeTree/administration/usermanagement/editUserGroupsUI.inc b/presentation/lookAndFeel/knowledgeTree/administration/usermanagement/editUserGroupsUI.inc index 80b0399..a450720 100644 --- a/presentation/lookAndFeel/knowledgeTree/administration/usermanagement/editUserGroupsUI.inc +++ b/presentation/lookAndFeel/knowledgeTree/administration/usermanagement/editUserGroupsUI.inc @@ -127,7 +127,12 @@ function InitGroups($iUserID) { $aUserGroupIDs = array(); $aManageableGroupIDs = array(); - $aUserGroupIDs = GroupUserLink::getGroups($iUserID); + $oUser = User::get($iUserID); + $aGroups = GroupUtil::listGroupsForUser($oUser); + $aGroupIDs = array(); + foreach ($aGroups as $oGroup) { + $aGroupIDs[] = $oGroup->getID(); + } if (Permission::userIsUnitAdministrator()) { /*ok*/ $sQuery = array("SELECT ST.id FROM " . $default->groups_table . " ST " . @@ -141,7 +146,7 @@ function InitGroups($iUserID) { } } - return array($aUserGroupIDs, $aManageableGroupIDs); + return array($aGroupIDs, $aManageableGroupIDs); } -- libgit2 0.21.4