Merge pull request #659 from ViniTou/EZP-29690-missing-conflict-modal

EZEE-2487: Version conflict pop-up missing for My scheduled on Dashboard
ezsystems · Oct 3, 2018 · 1f070f2 · 1f070f2
2 parents 9546af6 + abfc849
commit 1f070f2
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 1 deletion.
diff --git a/src/bundle/Resources/views/dashboard/dashboard.html.twig b/src/bundle/Resources/views/dashboard/dashboard.html.twig
@@ -34,6 +34,7 @@
         {{ form_widget(form_edit.language, {'attr': {'hidden': 'hidden', 'class': 'language-input'}}) }}
         {{ form_end(form_edit) }}
     </div>
+    {% include '@ezdesign/content/modal_version_conflict.html.twig' %}
 {% endblock %}
 
 {% block javascripts %}

diff --git a/src/bundle/Resources/views/dashboard/tab/my_drafts.html.twig b/src/bundle/Resources/views/dashboard/tab/my_drafts.html.twig
@@ -42,7 +42,6 @@
         {% endfor %}
         </tbody>
     </table>
-    {% include '@ezdesign/content/modal_version_conflict.html.twig' %}
 {% else %}
     <p class="ez-table-no-content mb-0 py-0">{{ 'dashboard.tab.my_drafts.empty'|trans|desc('No content items. Draft items you create will appear here') }}</p>
 {% endif %}