Merge pull request #2023 from tvdeyen/fix-delete-element-confirm

Fix delete element confirm dialog
AlchemyCMS · Feb 15, 2021 · 84c9d30 · 84c9d30
2 parents fe4c040 + fbc4109
commit 84c9d30
Show file tree

Hide file tree

Showing 5 changed files with 6 additions and 7 deletions.
diff --git a/app/assets/javascripts/alchemy/alchemy.confirm_dialog.js.coffee b/app/assets/javascripts/alchemy/alchemy.confirm_dialog.js.coffee
@@ -78,8 +78,9 @@ window.Alchemy.confirmToDeleteDialog = (url, opts) ->
         type: "DELETE"
         error: (xhr, status, error) ->
           type = if xhr.status == 403 then 'warning' else 'error'
-          Alchemy.pleaseWaitOverlay(false)
           Alchemy.growl(xhr.responseText || error, type)
+        complete: () ->
+          Alchemy.pleaseWaitOverlay(false)
 
   $.extend(options, opts)
   Alchemy.openConfirmDialog options.message, options
diff --git a/app/views/alchemy/admin/elements/_element.html.erb b/app/views/alchemy/admin/elements/_element.html.erb
@@ -4,11 +4,11 @@
   class: element.css_classes do %>
 
   <% unless element.fixed? %>
-    <%= render 'alchemy/admin/elements/element_header', element: element %>
+    <%= render 'alchemy/admin/elements/header', element: element %>
   <% end %>
 
   <% if element.expanded? || element.fixed? %>
-    <%= render 'alchemy/admin/elements/element_toolbar', element: element %>
+    <%= render 'alchemy/admin/elements/toolbar', element: element %>
 
     <% element.definition[:message].tap do |message| %>
       <%= render_message(:info, sanitize(message)) if message %>
@@ -36,7 +36,7 @@
         <% end %>
       <% end %>
 
-      <%= render 'alchemy/admin/elements/element_footer', element: element %>
+      <%= render 'alchemy/admin/elements/footer', element: element %>
     <% end %>
   <% end %>
 

diff --git a/...y/admin/elements/_element_footer.html.erb → ...s/alchemy/admin/elements/_footer.html.erb b/...y/admin/elements/_element_footer.html.erb → ...s/alchemy/admin/elements/_footer.html.erb
diff --git a/...y/admin/elements/_element_header.html.erb → ...s/alchemy/admin/elements/_header.html.erb b/...y/admin/elements/_element_header.html.erb → ...s/alchemy/admin/elements/_header.html.erb
diff --git a/.../admin/elements/_element_toolbar.html.erb → .../alchemy/admin/elements/_toolbar.html.erb b/.../admin/elements/_element_toolbar.html.erb → .../alchemy/admin/elements/_toolbar.html.erb
@@ -26,9 +26,7 @@
         render_icon('trash-alt'),
         Alchemy.t(:confirm_to_delete_element),
         alchemy.admin_element_path(element),
-        method: :delete,
-        class: "icon_button",
-        remote: true
+        class: "icon_button"
       ) -%>
       <label><%= Alchemy.t("Delete element") %></label>
     </div>