fix on edit form

FriendsOfAkeneo · Apr 11, 2014 · 039df5a · 039df5a
1 parent ad6d88f
commit 039df5a
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 11 deletions.
diff --git a/Configuration/Configuration.php b/Configuration/Configuration.php
@@ -304,9 +304,9 @@ protected function setDefaultOptions(OptionsResolverInterface $optionsResolver)
         $optionsResolver->setDefaults(
             array(
                 'base_template'                     => 'PimCustomEntityBundle::layout.html.twig',
-                'edit_template'                     => 'PimCustomEntityBundle:CustomEntity:edit.html.twig',
+                'edit_template'                     => 'PimCustomEntityBundle:CustomEntity:form.html.twig',
                 'index_template'                    => 'PimCustomEntityBundle:CustomEntity:index.html.twig',
-                'create_template'                   => 'PimCustomEntityBundle:CustomEntity:edit.html.twig',
+                'create_template'                   => 'PimCustomEntityBundle:CustomEntity:form.html.twig',
                 'create_form_type'                  => null,
                 'create_form_options'               => null,
                 'create_default_properties'         => array(),

diff --git a/Resources/views/CustomEntity/form.html.twig b/Resources/views/CustomEntity/form.html.twig
@@ -17,15 +17,17 @@
             {% set indexUrl = path(indexRoute, { customEntityName: customEntityName }) %}
             {% set buttons %}
                 {{ elements.backLink(indexUrl) }}
-                {{
-                    elements.deleteLink(
-                        path(removeRoute, { customEntityName: customEntityName, id: form.vars.value.id }),
-                        null,
-                        indexUrl,
-                        ('confirmation.remove.' ~ customEntityName)|trans,
-                        ('flash.' ~ customEntityName ~ '.removed')|trans
-                    )
-                }}
+                {% if form.vars.value.id is defined and form.vars.value.id != '' %}
+                    {{
+                        elements.deleteLink(
+                            path(removeRoute, { customEntityName: customEntityName, id: form.vars.value.id }),
+                            null,
+                            indexUrl,
+                            ('confirmation.remove.' ~ customEntityName)|trans,
+                            ('flash.' ~ customEntityName ~ '.removed')|trans
+                        )
+                    }}
+                {% endif %}
                 {{ elements.submitBtn() }}
             {% endset %}
             {{ elements.page_header(title, buttons, null, null, elements.updated(form.vars.id)) }}