[Gemstracker-svn] SF.net SVN: gemstracker:[743] tags/1.5.4/library/classes/Gems

[<gem...@li...>]

Revision: 743
          http://gemstracker.svn.sourceforge.net/gemstracker/?rev=743&view=rev
Author:   matijsdejong
Date:     2012-06-07 13:33:42 +0000 (Thu, 07 Jun 2012)
Log Message:
-----------
Small fix for new staff (already in trunk)
Small bug in Upgrades 

Modified Paths:
--------------
    tags/1.5.4/library/classes/Gems/Default/StaffAction.php
    tags/1.5.4/library/classes/Gems/Upgrades.php

Modified: tags/1.5.4/library/classes/Gems/Default/StaffAction.php
===================================================================
--- tags/1.5.4/library/classes/Gems/Default/StaffAction.php	2012-06-07 13:20:56 UTC (rev 742)
+++ tags/1.5.4/library/classes/Gems/Default/StaffAction.php	2012-06-07 13:33:42 UTC (rev 743)
@@ -136,8 +136,8 @@
         }
 
         // 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)) {
+        $allowedGroups = $this->util->getDbLookup()->getAllowedStaffGroups();
+        if (! ($new || array_key_exists($data['gsf_id_primary_group'], $allowedGroups))) {
             //Not allowed to update
             $model->set('gsf_id_primary_group', 'elementClass', 'Exhibitor');
         } else {
@@ -145,7 +145,7 @@
             $model->set('gsf_id_primary_group', 'multiOptions', $allowedGroups);
         }
         if ($new) {
-            $model->set('gsf_id_primary_group', 'default', $dbLookup->getDefaultGroup());
+            $model->set('gsf_id_primary_group', 'default', $this->util->getDbLookup()->getDefaultGroup());
         }
 
         $ucfirst = new Zend_Filter_Callback('ucfirst');

Modified: tags/1.5.4/library/classes/Gems/Upgrades.php
===================================================================
--- tags/1.5.4/library/classes/Gems/Upgrades.php	2012-06-07 13:20:56 UTC (rev 742)
+++ tags/1.5.4/library/classes/Gems/Upgrades.php	2012-06-07 13:33:42 UTC (rev 743)
@@ -121,10 +121,9 @@
     /**
      * To upgrade to 1.5.4 just execute patchlevel 47
      */
-    public function Upgrade152to153()
+    public function Upgrade153to154()
     {
         $this->_batch->addTask('Db_ExecutePatch', 47);
-        $this->_batch->addMessage($text);
 
         return true;
     }

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