Don't use rename for both scenarios!
This commit is contained in:
@@ -21,7 +21,7 @@
|
||||
<div data-controller="dialog" data-action="keydown.esc->dialog#close click@document->dialog#closeOnClickOutside">
|
||||
<button id="<%= dom_id(column, :manage_menu) %>" class="popup__btn btn" data-action="click->dialog#open:stop" data-clicker-target="clickable" hidden aria-hidden>Rename column</button>
|
||||
<dialog class="popup panel flex-column gap-half fill-white shadow txt-small margin-block-double" data-dialog-target="dialog">
|
||||
<%= render "collections/show/menu/column_form", collection: column.collection, column: column %>
|
||||
<%= render "collections/show/menu/column_form", collection: column.collection, column: column, label: "Rename column" %>
|
||||
</dialog>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
<%= form_with model: [collection, column], data: { action: "turbo:submit-end->dialog#close" } do |form| %>
|
||||
<%= form_with model: [collection, column], data: { controller: "form", action: "turbo:submit-end->dialog#close turbo:submit-end->form#reset" } do |form| %>
|
||||
<%= form.text_field :name, class: "input", placeholder: "Column name", value: column.name,
|
||||
required: true, autocomplete: "off", pattern: ".*\\S.*", title: "Column name cannot be blank" %>
|
||||
<%= form.submit "Rename column", class: "btn btn--link" %>
|
||||
<%= form.submit label, class: "btn btn--link" %>
|
||||
<% end %>
|
||||
|
||||
@@ -3,6 +3,6 @@
|
||||
<%= icon_tag "add", class: "translucent", "aria-hidden": true %>
|
||||
</button>
|
||||
<dialog class="popup panel flex-column gap-half fill-white shadow txt-small margin-block-double" data-dialog-target="dialog">
|
||||
<%= render "collections/show/menu/column_form", collection: collection, column: Column.new %>
|
||||
<%= render "collections/show/menu/column_form", collection: collection, column: Column.new, label: "Add column" %>
|
||||
</dialog>
|
||||
</div>
|
||||
|
||||
Reference in New Issue
Block a user