gemstracker-svn Mailing List for GemsTracker (Page 20)

SourceForge Headquarters 225 Broadway Suite 1600 San Diego, CA 92101 +1 (858) 422-6466

Revision: 756
          http://gemstracker.svn.sourceforge.net/gemstracker/?rev=756&view=rev
Author:   michieltcs
Date:     2012-06-12 12:51:56 +0000 (Tue, 12 Jun 2012)
Log Message:
-----------
Back out revisions 755 and 718

Modified Paths:
--------------
    tags/1.5.4-pulse-20120604/library/classes/Gems/Default/StaffAction.php
    tags/1.5.4-pulse-20120604/library/classes/Gems/Util/DbLookup.php

Modified: tags/1.5.4-pulse-20120604/library/classes/Gems/Default/StaffAction.php
===================================================================

--- tags/1.5.4-pulse-20120604/library/classes/Gems/Default/StaffAction.php	2012-06-12 12:33:25 UTC (rev 755)
+++ tags/1.5.4-pulse-20120604/library/classes/Gems/Default/StaffAction.php	2012-06-12 12:51:56 UTC (rev 756)
@@ -69,41 +69,9 @@
         if ($menuItem = $this->findAllowedMenuItem('show')) {
             $bridge->addItemLink($menuItem->toActionLinkLower($this->getRequest(), $bridge));
         }
-
-        $br = MUtil_Html::create('br');
-        $orgCount = count($model->get('gsf_id_organization', 'multiOptions'));
         foreach($model->getItemsOrdered() as $name) {
             if ($label = $model->get($name, 'label')) {
-                switch ($name) {
-                    case 'name':
-                        if ($orgCount > 1) {
-                            $bridge->addMultiSort('name', $br, 'gsf_email');
-                        } else {
-                            $bridge->addSortable($name, $label);
-                        }
-
-                        break;
-
-                    case 'gsf_email':
-                        if ($orgCount > 1) {
-                            //Do nothing as it is already linked in the 'name' field
-                        } else {
-                            $bridge->addSortable($name, $label);
-                        }
-                        break;
-
-                    case 'gsf_id_organization':
-                        if ($orgCount > 1) {
-                            $bridge->addSortable($name, $label);
-                        } else {
-                            //Don't show as it is always the same
-                        }
-                        break;
-
-                    default:
-                        $bridge->addSortable($name, $label);
-                        break;
-                }
+                $bridge->addSortable($name, $label);
             }
         }
         // Add edit button if allowed, otherwise show, again if allowed
@@ -134,18 +102,11 @@
             $user = $this->loader->getUserLoader()->getUserByStaffId($data['gsf_id_user']);
             // MUtil_Echo::track($data['gsf_id_user'], $user->getLoginName());
         }
+        $dbLookup = $this->util->getDbLookup();
 
-        // Find out if this group is in the inheritance path of the current user
-        $allowedGroups = $this->util->getDbLookup()->getAllowedStaffGroups();        
-        if (!array_key_exists($data['gsf_id_primary_group'], $allowedGroups)) {
-            //Not allowed to update
-            $model->set('gsf_id_primary_group', 'elementClass', 'Exhibitor');
-        } else {
-            //Allow only certain groups
-            $model->set('gsf_id_primary_group', 'multiOptions', $allowedGroups);
-        }
+        $model->set('gsf_id_primary_group', 'multiOptions', MUtil_Lazy::call($dbLookup->getAllowedStaffGroups));
         if ($new) {
-            $model->set('gsf_id_primary_group', 'default', $this->util->getDbLookup()->getDefaultGroup());
+            $model->set('gsf_id_primary_group', 'default', $dbLookup->getDefaultGroup());
         }
 
         $ucfirst = new Zend_Filter_Callback('ucfirst');
@@ -189,7 +150,7 @@
         $bridge->addFilter(  'gsf_last_name',      $ucfirst);
         $bridge->addText(    'gsf_email', array('size' => 30))->addValidator('SimpleEmail');
 
-        $bridge->add('gsf_id_primary_group');
+        $bridge->addSelect('gsf_id_primary_group');
         $bridge->addCheckbox('gul_can_login', 'description', $this->_('Users can only login when this box is checked.'));
         $bridge->addCheckbox('gsf_logout_on_survey', 'description', $this->_('If checked the user will logoff when answering a survey.'));
 

Modified: tags/1.5.4-pulse-20120604/library/classes/Gems/Util/DbLookup.php
===================================================================
--- tags/1.5.4-pulse-20120604/library/classes/Gems/Util/DbLookup.php	2012-06-12 12:33:25 UTC (rev 755)
+++ tags/1.5.4-pulse-20120604/library/classes/Gems/Util/DbLookup.php	2012-06-12 12:51:56 UTC (rev 756)
@@ -70,6 +70,12 @@
     protected $util;
 
     /**
+     *
+     * @var Zend_Session
+     */
+    protected $session;
+
+    /**
      * Retrieve a list of orgid/name pairs
      *
      * @staticvar array $organizations
@@ -142,12 +148,11 @@
     public function getAllowedStaffGroups()
     {
         $groups = $this->getActiveStaffGroups();
-        $user = GemsEscort::getInstance()->getLoader()->getCurrentUser();
-        if ($user->getRole() === 'master') {
+        if ($this->session->user_role === 'master') {
             return $groups;
 
         } else {
-            $rolesAllowed = $user->getRoles();
+            $rolesAllowed = $this->acl->getRoleAndParents($this->session->user_role);
             $roles        = $this->db->fetchPairs('SELECT ggp_id_group, ggp_role FROM gems__groups WHERE ggp_group_active=1 AND ggp_staff_members=1 ORDER BY ggp_name');
             $result       = array();
 

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.





2011	Jan	Feb	Mar	Apr	May	Jun	Jul	Aug	Sep (84)	Oct (70)	Nov (164)	Dec (71)
2012	Jan (52)	Feb (77)	Mar (70)	Apr (58)	May (81)	Jun (74)	Jul (87)	Aug (30)	Sep (45)	Oct (37)	Nov (51)	Dec (31)
2013	Jan (47)	Feb (29)	Mar (40)	Apr (33)	May	Jun	Jul	Aug	Sep	Oct	Nov	Dec

gemstracker-svn Mailing List for GemsTracker (Page 20)

gemstracker-svn — Receive updates on svn commits