[Gemstracker-svn] SF.net SVN: gemstracker:[1189] trunk/library/classes/Gems

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

Revision: 1189
          http://sourceforge.net/p/gemstracker/code/1189
Author:   mennodekker
Date:     2013-03-18 12:58:11 +0000 (Mon, 18 Mar 2013)
Log Message:
-----------
Old style tabforms (BrowseEditAction) had duplicate button row

Modified Paths:
--------------
    trunk/library/classes/Gems/Snippets/ModelFormSnippetAbstract.php
    trunk/library/classes/Gems/TabForm.php

Modified: trunk/library/classes/Gems/Snippets/ModelFormSnippetAbstract.php
===================================================================
--- trunk/library/classes/Gems/Snippets/ModelFormSnippetAbstract.php	2013-03-18 12:24:26 UTC (rev 1188)
+++ trunk/library/classes/Gems/Snippets/ModelFormSnippetAbstract.php	2013-03-18 12:58:11 UTC (rev 1189)
@@ -200,7 +200,6 @@
                         ->removeDecorator('HtmlTag')
                         ->removeDecorator('Label')
                         ->removeDecorator('DtDdWrapper');
-;
 
                 $this->_form->resetContext();
                 $this->_form->addElement($element);

Modified: trunk/library/classes/Gems/TabForm.php
===================================================================
--- trunk/library/classes/Gems/TabForm.php	2013-03-18 12:24:26 UTC (rev 1188)
+++ trunk/library/classes/Gems/TabForm.php	2013-03-18 12:58:11 UTC (rev 1189)
@@ -111,8 +111,8 @@
                 $element = $this->getElement($name);
             }
 
-            $this->addToOtherGroup($element);
-
+            //$this->addToOtherGroup($element); // Causes duplicate links on old browse edit
+            
             if ($element instanceof Zend_Form_Element_Hidden) {
                 //Remove decorators
                 $element->removeDecorator('HtmlTag');
@@ -122,6 +122,11 @@
             } elseif ($element instanceof Zend_Form_Element) {
 
                 $element->removeDecorator('DtDdWrapper');
+                
+                if ($element instanceof MUtil_Form_Element_Html) {
+                    $element->removeDecorator('HtmlTag');
+                    $element->removeDecorator('Label');
+                }
 
                 $error = $element->getDecorator('Errors');
                 if ($error instanceof Zend_Form_Decorator_Errors) {
@@ -274,7 +279,7 @@
             ));
         }
     }
-
+    
     /**
      * Reset the currentTab to be the main form again
      *

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