Skip to content

Commit 5602f59

Browse files
authored
Merge pull request #4349 from manyfold3d/fix-delete-buttons
Fix non-functional delete buttons for creators and collections
2 parents 9b6cdfc + 64285c5 commit 5602f59

File tree

2 files changed

+16
-18
lines changed

2 files changed

+16
-18
lines changed

app/views/collections/_form.html.erb

Lines changed: 8 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -17,14 +17,13 @@
1717
<%= text_input_row form, :caption %>
1818
<%= rich_text_input_row form, :notes, help: t(".notes.help_html") %>
1919
<%= render "caber_relations_form", form: form %>
20-
<div class="row mb-4">
21-
<div class='col'>
22-
<%= form.submit translate("general.save"), class: "btn btn-primary" %>
23-
</div>
24-
<% if @collection.persisted? %>
25-
<div class='col text-end'>
26-
<%= render Components::DoButton.new(icon: "trash", label: t("general.delete"), href: collection_path(@collection), method: :delete, variant: "outline-danger", confirm: translate("collections.destroy.confirm")) if policy(@collection).destroy? %>
27-
</div>
28-
<% end %>
20+
<%= form.submit translate("general.save"), class: "btn btn-primary float-start" %>
21+
<% end %>
22+
23+
<% if @collection.persisted? %>
24+
<div class='float-end'>
25+
<%= render Components::DoButton.new(icon: "trash", label: t("general.delete"), href: collection_path(@collection), method: :delete, variant: "outline-danger", confirm: translate("collections.destroy.confirm")) if policy(@collection).destroy? %>
2926
</div>
3027
<% end %>
28+
29+
<div class="clearfix"></div>

app/views/creators/_form.html.erb

Lines changed: 8 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -8,14 +8,13 @@
88
<%= text_input_row form, :caption %>
99
<%= rich_text_input_row form, :notes, help: t(".notes.help_html") %>
1010
<%= render "caber_relations_form", form: form %>
11-
<div class="row mb-4">
12-
<div class='col'>
13-
<%= form.submit translate("general.save"), class: "btn btn-primary" %>
14-
</div>
15-
<% if @creator.persisted? %>
16-
<div class='col text-end'>
17-
<%= render Components::DoButton.new(icon: "trash", label: t("general.delete"), href: creator_path(@creator), method: :delete, variant: "outline-danger", confirm: translate("creators.destroy.confirm")) if policy(@creator).destroy? %>
18-
</div>
19-
<% end %>
11+
<%= form.submit translate("general.save"), class: "btn btn-primary float-start" %>
12+
<% end %>
13+
14+
<% if @creator.persisted? %>
15+
<div class='float-end'>
16+
<%= render Components::DoButton.new(icon: "trash", label: t("general.delete"), href: creator_path(@creator), method: :delete, variant: "outline-danger", confirm: translate("creators.destroy.confirm")) if policy(@creator).destroy? %>
2017
</div>
2118
<% end %>
19+
20+
<div class="clearfix"></div>

0 commit comments

Comments
 (0)