From 3ee9f9b05900b9561a6617dde8e4bd32d7c7abf2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Juan=20Salvador=20P=C3=A9rez=20Garc=C3=ADa?= Date: Fri, 22 Jun 2018 17:40:51 +0200 Subject: [PATCH] Removed redundant partial proposal dashboard actions views use shared/errors partial instead of its current errors partial --- .../admin/proposal_dashboard_actions_controller.rb | 6 +++++- .../proposal_dashboard_actions/_errors.html.erb | 13 ------------- .../admin/proposal_dashboard_actions/_form.html.erb | 2 +- 3 files changed, 6 insertions(+), 15 deletions(-) delete mode 100644 app/views/admin/proposal_dashboard_actions/_errors.html.erb diff --git a/app/controllers/admin/proposal_dashboard_actions_controller.rb b/app/controllers/admin/proposal_dashboard_actions_controller.rb index c92811454..a40ea2e0a 100644 --- a/app/controllers/admin/proposal_dashboard_actions_controller.rb +++ b/app/controllers/admin/proposal_dashboard_actions_controller.rb @@ -1,5 +1,5 @@ class Admin::ProposalDashboardActionsController < Admin::BaseController - helper_method :proposal_dashboard_action + helper_method :proposal_dashboard_action, :resource def index @proposal_dashboard_actions = ProposalDashboardAction.all @@ -46,6 +46,10 @@ class Admin::ProposalDashboardActionsController < Admin::BaseController private + def resource + @proposal_dashboard_action + end + def proposal_dashboard_action_params params .require(:proposal_dashboard_action) diff --git a/app/views/admin/proposal_dashboard_actions/_errors.html.erb b/app/views/admin/proposal_dashboard_actions/_errors.html.erb deleted file mode 100644 index 34c7c5f2d..000000000 --- a/app/views/admin/proposal_dashboard_actions/_errors.html.erb +++ /dev/null @@ -1,13 +0,0 @@ -<% if proposal_dashboard_action.errors.any? %> -
- - - - <%= proposal_dashboard_action.errors.count %> - <%= t('admin.proposal_dashboard_actions.errors.form.error', count: proposal_dashboard_action.errors.count) %> - -
- -<% end %> diff --git a/app/views/admin/proposal_dashboard_actions/_form.html.erb b/app/views/admin/proposal_dashboard_actions/_form.html.erb index 1b1f7a3aa..322f34c96 100644 --- a/app/views/admin/proposal_dashboard_actions/_form.html.erb +++ b/app/views/admin/proposal_dashboard_actions/_form.html.erb @@ -1,6 +1,6 @@ <%= form_for [:admin, proposal_dashboard_action] do |f| %> - <%= render 'errors' %> + <%= render 'shared/errors' %>