From 4e086de4935bc9e23ab18d3f1ce48042dd979c8e Mon Sep 17 00:00:00 2001 From: Angel Perez Date: Thu, 26 Oct 2017 16:03:39 -0400 Subject: [PATCH] Add 'Delete' button to Valuators index/search views --- app/views/admin/valuators/index.html.erb | 17 ++++++++++------- app/views/admin/valuators/search.html.erb | 7 ++++++- config/locales/en/admin.yml | 1 + config/locales/es/admin.yml | 1 + 4 files changed, 18 insertions(+), 8 deletions(-) diff --git a/app/views/admin/valuators/index.html.erb b/app/views/admin/valuators/index.html.erb index 622d01307..dfb93ed80 100644 --- a/app/views/admin/valuators/index.html.erb +++ b/app/views/admin/valuators/index.html.erb @@ -1,6 +1,6 @@

<%= t("admin.valuators.index.title") %>

-<%= render 'admin/shared/user_search', url: search_admin_valuators_path %> +<%= render "admin/shared/user_search", url: search_admin_valuators_path %>
<% if @valuators.any? %> @@ -11,16 +11,13 @@ <%= t("admin.valuators.index.name") %> <%= t("admin.valuators.index.email") %> <%= t("admin.valuators.index.description") %> + <%= t("admin.actions.actions") %> <% @valuators.each do |valuator| %> - - <%= valuator.name %> - - - <%= valuator.email %> - + <%= valuator.name %> + <%= valuator.email %> <% if valuator.description.present? %> <%= valuator.description %> @@ -28,6 +25,12 @@ <%= t("admin.valuators.index.no_description") %> <% end %> + + <%= link_to t("admin.valuators.valuator.delete"), + admin_valuator_path(valuator), + method: :delete, + class: "button hollow alert expanded" %> + <% end %> diff --git a/app/views/admin/valuators/search.html.erb b/app/views/admin/valuators/search.html.erb index 2710cb44d..b383e554d 100644 --- a/app/views/admin/valuators/search.html.erb +++ b/app/views/admin/valuators/search.html.erb @@ -29,7 +29,12 @@ <%= t("admin.valuators.index.no_description") %> <% end %> - <% unless user.valuator? %> + <% if user.valuator? %> + <%= link_to t("admin.valuators.valuator.delete"), + admin_valuator_path(user), + method: :delete, + class: "button hollow alert expanded" %> + <% else %> <%= form_for Valuator.new(user: user), url: admin_valuators_path do |f| %> <%= f.text_field :description, label: false, diff --git a/config/locales/en/admin.yml b/config/locales/en/admin.yml index 823d7084b..911428b01 100644 --- a/config/locales/en/admin.yml +++ b/config/locales/en/admin.yml @@ -481,6 +481,7 @@ en: valuator: description_placeholder: 'Description (optional)' add: Add to valuators + delete: Delete search: title: 'Valuators: User search' summary: diff --git a/config/locales/es/admin.yml b/config/locales/es/admin.yml index 8d0b6cbf8..8b97a4ec0 100644 --- a/config/locales/es/admin.yml +++ b/config/locales/es/admin.yml @@ -481,6 +481,7 @@ es: valuator: description_placeholder: 'Descripción (opcional)' add: Añadir como evaluador + delete: Borrar search: title: 'Evaluadores: Búsqueda de usuarios' summary: