diff --git a/app/assets/javascripts/admin/communication/menu_items.js b/app/assets/javascripts/admin/communication/menu_items.js index 377884219c2ddde5a700bc1e877859749a9724ce..31e7a30ab2ca3cf4bdc8a995ceccbabc47b074cd 100644 --- a/app/assets/javascripts/admin/communication/menu_items.js +++ b/app/assets/javascripts/admin/communication/menu_items.js @@ -18,8 +18,8 @@ window.osuny.communication.menuItems = { onKindChange: function (event) { 'use strict'; var target = event.target, - // TODO get value from parent class="kind" - kind = target.dataset.tmp; + div = target.closest('[data-kind]'), + kind = div.dataset.kind; this.chooseKind(kind); this.loadData(kind); }, diff --git a/app/views/admin/communication/website/menu/items/_form.html.erb b/app/views/admin/communication/website/menu/items/_form.html.erb index 17768fb6479ef0a3991798f231f559ffe155ba52..7c72ce057fad651bf3ad45468fa288da2c941f88 100644 --- a/app/views/admin/communication/website/menu/items/_form.html.erb +++ b/app/views/admin/communication/website/menu/items/_form.html.erb @@ -15,22 +15,28 @@ url: kind_switch_admin_communication_website_menu_items_path } } %> - <div class="row"> - <% @website.menu_item_kinds.keys.each do |kind| %> - <div class="col-6 col-lg-4 col-xl-3"> - <div class="card kind" data-kind="<%= kind %>"> - <div class="card-body"> - <p class="text-end mb-0"> - <i class="<%= icon_for "communication.website.menu.item.kind.#{kind}" %> fa-2x"></i><br> - </p> - <p class="mb-0"> - <%= t "enums.communication.website.menu.item.kind.#{kind}" %> - </p> - <a class="stretched-link" data-tmp="<%= kind %>"></a> + <div class="mb-3"> + <label class="form-label required"> + <%= Communication::Website::Menu::Item.human_attribute_name('kind') %> + <abbr title="required">*</abbr> + </label> + <div class="row"> + <% @website.menu_item_kinds.keys.each do |kind| %> + <div class="col-6 col-lg-4 col-xl-3"> + <div class="card kind" data-kind="<%= kind %>"> + <div class="card-body"> + <p class="text-end mb-0"> + <i class="<%= icon_for "communication.website.menu.item.kind.#{kind}" %> fa-2x"></i><br> + </p> + <p class="mb-0"> + <%= t "enums.communication.website.menu.item.kind.#{kind}" %> + </p> + <a class="stretched-link"></a> + </div> </div> </div> - </div> - <% end %> + <% end %> + </div> </div> <div data-kind-if="url"> <%= f.input :url, as: :string %>