[Gemstracker-svn] SF.net SVN: gemstracker:[432] branches/1.5.x/library/classes

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

Revision: 432
          http://gemstracker.svn.sourceforge.net/gemstracker/?rev=432&view=rev
Author:   mennodekker
Date:     2012-01-30 15:04:13 +0000 (Mon, 30 Jan 2012)
Log Message:
-----------
Final fix to formbridge + removed obsolete statement from staffaction

Modified Paths:
--------------
    branches/1.5.x/library/classes/Gems/Default/StaffAction.php
    branches/1.5.x/library/classes/MUtil/Model/FormBridge.php

Modified: branches/1.5.x/library/classes/Gems/Default/StaffAction.php
===================================================================
--- branches/1.5.x/library/classes/Gems/Default/StaffAction.php	2012-01-30 13:36:35 UTC (rev 431)
+++ branches/1.5.x/library/classes/Gems/Default/StaffAction.php	2012-01-30 15:04:13 UTC (rev 432)
@@ -188,9 +188,6 @@
             $this->_instanceId = $data['gsf_login'];
         }
 
-        $sql = "SELECT ggp_id_group,ggp_role FROM gems__groups WHERE ggp_id_group = " . (int) $data['gsf_id_primary_group'];
-        $groups = $this->db->fetchPairs($sql);
-
         if (!isset($data['gsf_id_organization']) || empty($data['gsf_id_organization'])) {
             $data['gsf_id_organization'] = $this->menu->getParameterSource()->getMenuParameter('gsf_id_organization', $this->loader->getCurrentUser()->getCurrentOrganizationId());
         }

Modified: branches/1.5.x/library/classes/MUtil/Model/FormBridge.php
===================================================================
--- branches/1.5.x/library/classes/MUtil/Model/FormBridge.php	2012-01-30 13:36:35 UTC (rev 431)
+++ branches/1.5.x/library/classes/MUtil/Model/FormBridge.php	2012-01-30 15:04:13 UTC (rev 432)
@@ -243,7 +243,11 @@
         $options = func_get_args();
         $options = MUtil_Ra::pairs($options, 1);
 
-        $options = $this->_mergeOptions($name, $options, self::AUTO_OPTIONS);
+        /**
+         * As this method redirects to the correct 'add' method, we preserve the original options
+         * while trying to find the needed ones in the model
+         */
+        $options = $options + $this->_mergeOptions($name, $options, self::AUTO_OPTIONS);
 
         if (isset($options['elementClass'])) {
             $method = 'add' . $options['elementClass'];

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