Peter M. Groen / knowledgetree

Commit 02a05034651da007dc31ffc791ee0e7e70c3df06

Authored by nbm
1 parent 78b1cf0f

User GroupUtil::listGroupsForUser instead of playing with Link objects. 


git-svn-id: https://kt-dms.svn.sourceforge.net/svnroot/kt-dms/trunk@3428 c91229c3-7414-0410-bfa2-8a42b809f60b
Inline Side-by-side
Showing 2 changed files with 8 additions and 3 deletions
presentation/lookAndFeel/knowledgeTree/administration/usermanagement/editUserGroupsBL.php
  View file @02a0503
@@ -61,8 +61,8 @@ if (checkSession()) { @@ -61,8 +61,8 @@ if (checkSession()) {
61 require_once("$default->fileSystemRoot/lib/visualpatterns/PatternCreate.inc"); 61 require_once("$default->fileSystemRoot/lib/visualpatterns/PatternCreate.inc");
62 require_once("editUserGroupsUI.inc"); 62 require_once("editUserGroupsUI.inc");
63 require_once("$default->fileSystemRoot/lib/groups/Group.inc"); 63 require_once("$default->fileSystemRoot/lib/groups/Group.inc");
  64 + require_once("$default->fileSystemRoot/lib/groups/GroupUtil.php");
64 require_once("$default->fileSystemRoot/lib/users/User.inc"); 65 require_once("$default->fileSystemRoot/lib/users/User.inc");
65 - require_once("$default->fileSystemRoot/lib/groups/GroupUserLink.inc");  
66 require_once("$default->fileSystemRoot/lib/security/Permission.inc"); 66 require_once("$default->fileSystemRoot/lib/security/Permission.inc");
67 require_once("$default->fileSystemRoot/presentation/webpageTemplate.inc"); 67 require_once("$default->fileSystemRoot/presentation/webpageTemplate.inc");
68 require_once("$default->fileSystemRoot/lib/visualpatterns/PatternCustom.inc"); 68 require_once("$default->fileSystemRoot/lib/visualpatterns/PatternCustom.inc");
presentation/lookAndFeel/knowledgeTree/administration/usermanagement/editUserGroupsUI.inc
  View file @02a0503
@@ -127,7 +127,12 @@ function InitGroups($iUserID) { @@ -127,7 +127,12 @@ function InitGroups($iUserID) {
127 $aUserGroupIDs = array(); 127 $aUserGroupIDs = array();
128 $aManageableGroupIDs = array(); 128 $aManageableGroupIDs = array();
129 129
130 - $aUserGroupIDs = GroupUserLink::getGroups($iUserID); 130 + $oUser = User::get($iUserID);
  131 + $aGroups = GroupUtil::listGroupsForUser($oUser);
  132 + $aGroupIDs = array();
  133 + foreach ($aGroups as $oGroup) {
  134 + $aGroupIDs[] = $oGroup->getID();
  135 + }
131 136
132 if (Permission::userIsUnitAdministrator()) { 137 if (Permission::userIsUnitAdministrator()) {
133 /*ok*/ $sQuery = array("SELECT ST.id FROM " . $default->groups_table . " ST " . 138 /*ok*/ $sQuery = array("SELECT ST.id FROM " . $default->groups_table . " ST " .
@@ -141,7 +146,7 @@ function InitGroups($iUserID) { @@ -141,7 +146,7 @@ function InitGroups($iUserID) {
141 } 146 }
142 } 147 }
143 148
144 - return array($aUserGroupIDs, $aManageableGroupIDs); 149 + return array($aGroupIDs, $aManageableGroupIDs);
145 } 150 }
146 151
147 152