Add MetastazTemplate form generation

mirsal · Aug 11, 2011 · d5557eb · d5557eb
1 parent ca605ec
commit d5557eb
Show file tree

Hide file tree

Showing 4 changed files with 24 additions and 5 deletions.
diff --git a/lib/Metastaz/Stores/DoctrineMetastazStore.php b/lib/Metastaz/Stores/DoctrineMetastazStore.php
@@ -33,7 +33,7 @@ protected function getEntityManager()
             $params = $this->getMetastazContainer()->getParameter('metastaz.store_parameters');
             $this->em = MetastazBundle::getContainer()
                 ->get('doctrine')
-                ->getEntityManager($params['connexion_name'])
+                ->getEntityManager($params['connection_name'])
             ;
         }
         return $this->em;

diff --git a/src/Metastaz/Bundle/MetastazTemplateBundle/Entity/MetastazField.php b/src/Metastaz/Bundle/MetastazTemplateBundle/Entity/MetastazField.php
@@ -3,6 +3,7 @@
 
 use Doctrine\ORM\Mapping as ORM;
 use Symfony\Component\Validator\Constraints as Assert;
+use Symfony\Component\DependencyInjection\Container;
 
 /**
  * MetastazField define a field aggregate by a MetastazTemplate
@@ -94,7 +95,7 @@ public function getId()
      */
     public function setMetaNamespace($metaNamespace)
     {
-        $this->meta_namespace = $metaNamespace;
+        $this->meta_namespace = Container::camelize(str_replace(' ', '_', $metaNamespace));
     }
 
     /**
@@ -114,7 +115,7 @@ public function getMetaNamespace()
      */
     public function setMetaKey($metaKey)
     {
-        $this->meta_key = $metaKey;
+        $this->meta_key = Container::camelize(str_replace(' ', '_', $metaKey));
     }
 
     /**

diff --git a/src/Metastaz/Bundle/MetastazTemplateBundle/Entity/MetastazTemplate.php b/src/Metastaz/Bundle/MetastazTemplateBundle/Entity/MetastazTemplate.php
@@ -3,6 +3,7 @@
 
 use Doctrine\ORM\Mapping as ORM;
 use Doctrine\Common\Collections\ArrayCollection;
+use Symfony\Component\DependencyInjection\Container;
 
 /**
  * MetastazTemplate define the metadata fields that can use a metastaz object
@@ -58,7 +59,7 @@ public function getId()
      */
     public function setName($name)
     {
-        $this->name = $name;
+        $this->name = Container::camelize(str_replace(' ', '_', $name));
     }
 
     /**
@@ -129,4 +130,21 @@ public function hasField($namespace, $key)
         }
         return false;
     }
+
+    /**
+     * Get an array of field types
+     *
+     * @return array 
+     */
+    public function getFormFields()
+    {
+        $ret = array();
+        foreach($this->getMetastazFields() as $field) {
+            $ret[] = array(
+                $field->getMetaNamespace().'_'.$field->getMetaKey(),
+                $field->getMetastazFieldType()
+            );
+        }
+        return $ret;
+    }
 }
diff --git a/src/Metastaz/Bundle/MetastazTemplateBundle/Form/MetastazFieldType.php b/src/Metastaz/Bundle/MetastazTemplateBundle/Form/MetastazFieldType.php
@@ -14,8 +14,8 @@ public function buildForm(FormBuilder $builder, array $options)
             ->add('meta_key')
             ->add('is_indexed')
             ->add('options')
-            ->add('metastaz_field_type')
             ->add('metastaz_template')
+            ->add('metastaz_field_type')
         ;
     }