Fix translate

daveshow · May 16, 2012 · 2fb9ee8 · 2fb9ee8
1 parent c8f6891
commit 2fb9ee8
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 9 deletions.
diff --git a/library/Centurion/Contrib/core/traits/Version/Model/DbTable.php b/library/Centurion/Contrib/core/traits/Version/Model/DbTable.php
@@ -23,6 +23,6 @@ public function init()
 
     public function onSelect($signal, $sender, $select, $applyDefaultFilters)
     {
-        throw new Centurion_Traits_Exception("Not implemented yet");
+        throw new Centurion_Traits_Exception('Not implemented yet');
     }
 }
diff --git a/library/Centurion/Contrib/translation/traits/Form/Model.php b/library/Centurion/Contrib/translation/traits/Form/Model.php
@@ -10,6 +10,9 @@ public function init()
         Centurion_Signal::factory('on_populate_with_instance')->connect(array($this, 'populateWithInstance'), $this->_form);
         Centurion_Signal::factory('pre_populate')->connect(array($this, 'prePopulate'), $this->_form);
         Centurion_Signal::factory('on_form_get_toolbar')->connect(array($this, 'onFormGetToolbar'), $this->_form);
+
+        $this->_form->enableElement('original_id');
+        $this->_form->enableElement('language_id');
     }
 
     /**
@@ -74,7 +77,7 @@ public function preGenerate()
                                                     $this->getView()->translate('Language'),
                                                     (string) Translation_Traits_Common::getDefaultLanguage()->name));
 
-        
+
         if ($this->getModel()->isOriginalForcedToDefaultLanguage()) {
 
             $f = new Zend_Form_Element_Hidden(array('disableTranslator' => true, 'name' => Translation_Traits_Model_DbTable::LANGUAGE_FIELD,
@@ -96,7 +99,6 @@ public function preGenerate()
 
             $this->addElement($f, Translation_Traits_Model_DbTable::LANGUAGE_FIELD);
         }
-
     }
 
     public function prePopulate($signal, $sender, $values)

diff --git a/library/Centurion/Controller/Mptt.php b/library/Centurion/Controller/Mptt.php
@@ -159,8 +159,6 @@ public function editAction()
 
         $this->_formViewScript = 'mptt/edit.phtml';
         $this->_renderForm($this->view->form);
-
-        $this->renderIfNotExists('mptt/edit', null, true);
     }
 
     public function newAction()
@@ -182,8 +180,6 @@ public function createAction()
 
         $this->_formViewScript = 'mptt/create.phtml';
         $this->_renderForm($this->view->form);
-
-        $this->renderIfNotExists('mptt/create', null, true);
     }
 
     public function moveAction()
@@ -528,4 +524,4 @@ protected function _preSave()
     protected function _postSave()
     {
     }
-}
+}
diff --git a/library/Centurion/Traits/Form/Abstract.php b/library/Centurion/Traits/Form/Abstract.php
@@ -2,9 +2,10 @@
 class Centurion_Traits_Form_Abstract extends Centurion_Traits_Abstract
 {
     /**
-     * @var Centurion_Form
+     * @var Centurion_Form_Model
      */
     protected $_form;
+
 
     /**
      * @param Centurion_Form $form