From 64cbed838aa0e90a2ff30e4ff27b7de4449ecde0 Mon Sep 17 00:00:00 2001 From: decabeza Date: Thu, 31 Jan 2019 17:23:45 +0100 Subject: [PATCH] Fix hound warnings --- .../admin/widget/cards_controller.rb | 56 +++++++++---------- .../site_customization/cards/index.html.erb | 2 +- spec/features/admin/widgets/cards_spec.rb | 8 +-- 3 files changed, 33 insertions(+), 33 deletions(-) diff --git a/app/controllers/admin/widget/cards_controller.rb b/app/controllers/admin/widget/cards_controller.rb index 8f97238a3..6dc573131 100644 --- a/app/controllers/admin/widget/cards_controller.rb +++ b/app/controllers/admin/widget/cards_controller.rb @@ -40,36 +40,36 @@ class Admin::Widget::CardsController < Admin::BaseController private - def card_params - image_attributes = [:id, :title, :attachment, :cached_attachment, :user_id, :_destroy] + def card_params + image_attributes = [:id, :title, :attachment, :cached_attachment, :user_id, :_destroy] - params.require(:widget_card).permit( - :link_url, :button_text, :button_url, :alignment, :header, :site_customization_page_id, - :columns, - translation_params(Widget::Card), - image_attributes: image_attributes - ) - end - - def header_card? - params[:header_card].present? - end - - def redirect_to_customization_page_cards_or_homepage - notice = t("admin.site_customization.pages.cards.#{params[:action]}.notice") - - if @card.site_customization_page_id - redirect_to admin_site_customization_page_cards_path(page), notice: notice - else - redirect_to admin_homepage_url, notice: notice + params.require(:widget_card).permit( + :link_url, :button_text, :button_url, :alignment, :header, :site_customization_page_id, + :columns, + translation_params(Widget::Card), + image_attributes: image_attributes + ) end - end - def page - ::SiteCustomization::Page.find(@card.site_customization_page_id) - end + def header_card? + params[:header_card].present? + end - def resource - Widget::Card.find(params[:id]) - end + def redirect_to_customization_page_cards_or_homepage + notice = t("admin.site_customization.pages.cards.#{params[:action]}.notice") + + if @card.site_customization_page_id + redirect_to admin_site_customization_page_cards_path(page), notice: notice + else + redirect_to admin_homepage_url, notice: notice + end + end + + def page + ::SiteCustomization::Page.find(@card.site_customization_page_id) + end + + def resource + Widget::Card.find(params[:id]) + end end diff --git a/app/views/admin/site_customization/cards/index.html.erb b/app/views/admin/site_customization/cards/index.html.erb index 1256f7017..32ccf8fb3 100644 --- a/app/views/admin/site_customization/cards/index.html.erb +++ b/app/views/admin/site_customization/cards/index.html.erb @@ -7,7 +7,7 @@ <%= @page.title %> <%= t("admin.site_customization.pages.cards.cards_title") %>
- <%= link_to t("admin.site_customization.pages.cards.create_card"), + <%= link_to t("admin.site_customization.pages.cards.create_card"), new_admin_widget_card_path(page_id: params[:page_id]), class: "button" %>
diff --git a/spec/features/admin/widgets/cards_spec.rb b/spec/features/admin/widgets/cards_spec.rb index 7496187f0..b8ce71cba 100644 --- a/spec/features/admin/widgets/cards_spec.rb +++ b/spec/features/admin/widgets/cards_spec.rb @@ -1,6 +1,6 @@ -require 'rails_helper' +require "rails_helper" -feature 'Cards' do +feature "Cards" do background do admin = create(:administrator).user @@ -232,8 +232,8 @@ feature 'Cards' do image_input = all(".image").last.find("input[type=file]", visible: false) attach_file( image_input[:id], - Rails.root.join('spec/fixtures/files/clippy.jpg'), + Rails.root.join("spec/fixtures/files/clippy.jpg"), make_visible: true) - expect(page).to have_field('widget_card_image_attributes_title', with: "clippy.jpg") + expect(page).to have_field("widget_card_image_attributes_title", with: "clippy.jpg") end end