[Jaws-commits] r13425 - in trunk/jaws/html/gadgets/Users: . Model/Admin

afz at jaws-project.com afz at jaws-project.com
Mon Aug 13 17:20:25 UTC 2012


Author: afz
Date: 2012-08-13 17:20:24 +0000 (Mon, 13 Aug 2012)
New Revision: 13425

Modified:
   trunk/jaws/html/gadgets/Users/AdminAjax.php
   trunk/jaws/html/gadgets/Users/Model/Admin/GroupACL.php
   trunk/jaws/html/gadgets/Users/Model/Admin/UsersGroup.php
Log:
using new changes in jaws users class

Modified: trunk/jaws/html/gadgets/Users/AdminAjax.php
===================================================================
--- trunk/jaws/html/gadgets/Users/AdminAjax.php	2012-08-13 17:18:20 UTC (rev 13424)
+++ trunk/jaws/html/gadgets/Users/AdminAjax.php	2012-08-13 17:20:24 UTC (rev 13425)
@@ -421,7 +421,7 @@
     function GetGroupACLKeys($guid)
     {
         $this->CheckSession('Users', 'ManageGroupACLs');
-        $profile = $this->_UserModel->GetGroupInfoById($guid);
+        $profile = $this->_UserModel->GetGroup((int)$guid);
         if (isset($profile['name'])) {
             $uModel = $GLOBALS['app']->LoadGadget('Users', 'AdminModel', 'GroupACL');
             $acl = $uModel->GetGroupACLKeys($guid);
@@ -612,7 +612,7 @@
      */
     function GetGroup($guid)
     {
-        $group = $this->_UserModel->GetGroupInfoById($guid);
+        $group = $this->_UserModel->GetGroup($guid);
         if (Jaws_Error::IsError($group)) {
             return array();
         }
@@ -699,7 +699,7 @@
         $this->CheckSession('Users', 'ManageGroups');
         $currentUid = $GLOBALS['app']->Session->GetAttribute('user');
 
-        $groupinfo = $this->_UserModel->GetGroupInfoById($guid);
+        $groupinfo = $this->_UserModel->GetGroup($guid);
         if (!$this->_UserModel->DeleteGroup($guid)) {
             $GLOBALS['app']->Session->PushLastResponse(_t('USERS_GROUPS_CANT_DELETE', $groupinfo['name']),
                                                        RESPONSE_ERROR);

Modified: trunk/jaws/html/gadgets/Users/Model/Admin/GroupACL.php
===================================================================
--- trunk/jaws/html/gadgets/Users/Model/Admin/GroupACL.php	2012-08-13 17:18:20 UTC (rev 13424)
+++ trunk/jaws/html/gadgets/Users/Model/Admin/GroupACL.php	2012-08-13 17:20:24 UTC (rev 13425)
@@ -67,7 +67,7 @@
         require_once JAWS_PATH . 'include/Jaws/User.php';
         $userModel = new Jaws_User();
 
-        if ($group = $userModel->GetGroupInfoById($guid)) {
+        if ($group = $userModel->GetGroup((int)$guid)) {
             $GLOBALS['app']->ACL->LoadAllFiles();
             $GLOBALS['app']->ACL->LoadKeysOf($guid, 'groups');
             foreach ($keys as $key => $value) {

Modified: trunk/jaws/html/gadgets/Users/Model/Admin/UsersGroup.php
===================================================================
--- trunk/jaws/html/gadgets/Users/Model/Admin/UsersGroup.php	2012-08-13 17:18:20 UTC (rev 13424)
+++ trunk/jaws/html/gadgets/Users/Model/Admin/UsersGroup.php	2012-08-13 17:20:24 UTC (rev 13425)
@@ -24,7 +24,7 @@
         require_once JAWS_PATH . 'include/Jaws/User.php';
         $userModel = new Jaws_User();
 
-        $group = $userModel->GetGroupInfoById($guid);
+        $group = $userModel->GetGroup((int)$guid);
         if (!$group) {
             return new Jaws_Error(_t('USERS_GROUPS_GROUP_NOT_EXIST'), _t('USERS_NAME'));
         }



More information about the Jaws-commits mailing list