首頁 探索 說明
註冊 登入
3erPartyFlowdat3
/
SonataAdminBundle
2
0
複刻 0
檔案 問題管理 0 合併請求 0 Wiki
瀏覽代碼

Fix #97 - issue with block being call twice

Thomas Rabaix 14 年之前
父節點
7a5a9260af
當前提交
136021737f
共有 2 個文件被更改，包括 27 次插入 和 18 次删除
統一視圖 顯示文件統計
  1. 2 3
      Resources/views/CRUD/base_edit.html.twig
  2. 25 15
      Resources/views/standard_layout.html.twig

+ 2 - 3
Resources/views/CRUD/base_edit.html.twig
查看文件 

@@ -64,6 +64,8 @@ file that was distributed with this source code.
 
             {% endif %}
 
             {% endif %}
 
         {% endfor %}
 
         {% endfor %}
 
 
 
+        {{ form_rest(form) }}
 
+
 
         {% if app.request.isxmlhttprequest %}
 
         {% if app.request.isxmlhttprequest %}
 
             {% if object.id %}
 
             {% if object.id %}
 
                 <input type="submit" name="btn_update" value="{% trans from admin.translationdomain %}btn_update{% endtrans %}"/>
 
                 <input type="submit" name="btn_update" value="{% trans from admin.translationdomain %}btn_update{% endtrans %}"/>
 
@@ -79,8 +81,5 @@ file that was distributed with this source code.
 
                 <input type="submit" name="btn_create_and_create" value="{% trans from admin.translationdomain %}btn_create_and_create_a_new_one{% endtrans %}"/>
 
                 <input type="submit" name="btn_create_and_create" value="{% trans from admin.translationdomain %}btn_create_and_create_a_new_one{% endtrans %}"/>
 
             {% endif %}
 
             {% endif %}
 
         {% endif %}
 
         {% endif %}
 
-
 
-        {{ form_rest(form) }}
 
-
 
     </form>
 
     </form>
 
 {% endblock %}
 
 {% endblock %}

+ 25 - 15
Resources/views/standard_layout.html.twig
查看文件 

@@ -51,6 +51,16 @@ file that was distributed with this source code.
 
         </title>
 
         </title>
 
     </head>
 
     </head>
 
     <body>
 
     <body>
 
+
 
+        {# initialize block value #}
 
+        {% set preview      = block('preview') %}
 
+        {% set form         = block('form') %}
 
+        {% set list_table   = block('list_table') %}
 
+        {% set list_filters = block('list_filters') %}
 
+        {% set side_menu    = block('side_menu') %}
 
+        {% set content      = block('content') %}
 
+
 
+
 
         <div class="container">
 
         <div class="container">
 
             <div class="span-24 last header">
 
             <div class="span-24 last header">
 
                 <div class="span-20">
 
                 <div class="span-20">
 
@@ -83,52 +93,52 @@ file that was distributed with this source code.
 
                 </div>
 
                 </div>
 
             </div>
 
             </div>
 
 
 
-            {% if block('preview') is not empty %}
 
+            {% if preview is not empty %}
 
                 <div class="span-24 last content clear">
 
                 <div class="span-24 last content clear">
 
-                    <div class="sonata-ba-preview">{{ block('preview')|raw }}</div>
 
+                    <div class="sonata-ba-preview">{{ preview|raw }}</div>
 
                 </div>
 
                 </div>
 
             {% endif %}
 
             {% endif %}
 
 
 
             <div class="span-24 last content clear">
 
             <div class="span-24 last content clear">
 
 
 
-                {% if block('side_menu') is not empty %}
 
+                {% if side_menu is not empty %}
 
                         <div class="span-4">
 
                         <div class="span-4">
 
-                            <div class="sonata-ba-side-menu">{{ block('side_menu')|raw }}</div>
 
+                            <div class="sonata-ba-side-menu">{{ side_menu|raw }}</div>
 
                         </div>
 
                         </div>
 
                         <div class="span-18 last content">
 
                         <div class="span-18 last content">
 
                 {% endif %}
 
                 {% endif %}
 
 
 
-                    {% if block('content') is not empty %}
 
-                        <div class="sonata-ba-content">{{ block('content')|raw }}</div>
 
+                    {% if content is not empty %}
 
+                        <div class="sonata-ba-content">{{ content|raw }}</div>
 
                     {% endif %}
 
                     {% endif %}
 
 
 
-                    {% if block('form') is not empty %}
 
-                        <div class="sonata-ba-form">{{ block('form')|raw }}</div>
 
+                    {% if form is not empty %}
 
+                        <div class="sonata-ba-form">{{ form|raw }}</div>
 
                     {% endif %}
 
                     {% endif %}
 
 
 
-                    {% if block('list_table') is not empty or block('list_filters') is not empty %}
 
-                        {% if block('side_menu') is not empty %}
 
+                    {% if list_table is not empty or list_filters is not empty %}
 
+                        {% if side_menu is not empty %}
 
                             <div class="sonata-ba-list">
 
                             <div class="sonata-ba-list">
 
                                 <div class="span-13">
 
                                 <div class="span-13">
 
-                                    {{ block('list_table')|raw }}
 
+                                    {{ list_table|raw }}
 
                                 </div>
 
                                 </div>
 
                                 <div class="span-5 last">
 
                                 <div class="span-5 last">
 
-                                    {{ block('list_filters')|raw }}
 
+                                    {{ list_filters|raw }}
 
                                 </div>
 
                                 </div>
 
                             </div>
 
                             </div>
 
                         {% else %}
 
                         {% else %}
 
                             <div class="sonata-ba-list">
 
                             <div class="sonata-ba-list">
 
                                 <div class="span-19">
 
                                 <div class="span-19">
 
-                                    {{ block('list_table')|raw }}
 
+                                    {{ list_table|raw }}
 
                                 </div>
 
                                 </div>
 
                                 <div class="span-5 last">
 
                                 <div class="span-5 last">
 
-                                    {{ block('list_filters')|raw }}
 
+                                    {{ list_filters|raw }}
 
                                 </div>
 
                                 </div>
 
                             </div>
 
                             </div>
 
                         {% endif %}
 
                         {% endif %}
 
                     {% endif %}
 
                     {% endif %}
 
 
 
-                {% if block('side_menu') is not empty %}
 
+                {% if side_menu is not empty %}
 
                     </div>
 
                     </div>
 
                 {% endif %}
 
                 {% endif %}