default confirm message when defined but not valued

alterphp · Aug 24, 2018 · dece12c · dece12c
1 parent ee60273
commit dece12c
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/src/Resources/public/js/easyadmin-extension.js b/src/Resources/public/js/easyadmin-extension.js
@@ -61,7 +61,7 @@ $(function() {
 
     var message = $(this).data('confirm');
     var content = $('#modal-confirm p.modal-body-content');
-    content.html(typeof message === "string" ? message : content.data('default'));
+    content.html(message);
 
     var confirmButton = $('#modal-confirm #modal-confirm-button');
     if (!confirmButton.find('i').length) { confirmButton.prepend('<i></i>'); }

diff --git a/src/Resources/views/default/includes/_actions.html.twig b/src/Resources/views/default/includes/_actions.html.twig
@@ -8,8 +8,8 @@
   {% endif %}
 
   {% set confirm = false %}
-  {% if action.confirm is defined and action.confirm %}
-    {% set confirm = action.confirm %}
+  {% if action.confirm is defined %}
+    {% set confirm = action.confirm|default('confirm_modal.content'|trans(trans_parameters, 'EasyAdminBundle')) %}
   {% endif %}
 
   <a name="{{ action.name }}" class="{{ action.css_class|default('') }}" title="{{ action.title|default('') is empty ? '' : action.title|trans(trans_parameters, translation_domain) }}" {% if not confirm %}href="{{ action_href }}" target="{{ action.target }}"{% else %}href="#" data-href="{{ action_href }}" data-confirm="{{ confirm }}"{% endif %}>