From 822a17f732eb3355f23edbfdfb124d02b3bd9d58 Mon Sep 17 00:00:00 2001 From: luisramos0 Date: Tue, 17 Sep 2019 15:56:53 +0100 Subject: [PATCH] Fix basic rubocop issues in newly added controllers --- .../spree/admin/countries_controller.rb | 8 +++---- .../spree/admin/states_controller.rb | 20 ++++++++-------- .../spree/admin/zones_controller.rb | 24 +++++++++---------- 3 files changed, 25 insertions(+), 27 deletions(-) diff --git a/app/controllers/spree/admin/countries_controller.rb b/app/controllers/spree/admin/countries_controller.rb index 1b0ddde02d..4314e54b37 100644 --- a/app/controllers/spree/admin/countries_controller.rb +++ b/app/controllers/spree/admin/countries_controller.rb @@ -1,11 +1,9 @@ module Spree module Admin class CountriesController < ResourceController - - def collection - super.order(:name) - end - + def collection + super.order(:name) + end end end end diff --git a/app/controllers/spree/admin/states_controller.rb b/app/controllers/spree/admin/states_controller.rb index 20736203fe..eebbee8d44 100644 --- a/app/controllers/spree/admin/states_controller.rb +++ b/app/controllers/spree/admin/states_controller.rb @@ -7,23 +7,23 @@ module Spree def index respond_with(@collection) do |format| format.html - format.js { render :partial => 'state_list' } + format.js { render partial: 'state_list' } end end protected - def location_after_save - admin_country_states_url(@country) - end + def location_after_save + admin_country_states_url(@country) + end - def collection - super.order(:name) - end + def collection + super.order(:name) + end - def load_data - @countries = Country.order(:name) - end + def load_data + @countries = Country.order(:name) + end end end end diff --git a/app/controllers/spree/admin/zones_controller.rb b/app/controllers/spree/admin/zones_controller.rb index bd298e7f2c..5b5b9d876b 100644 --- a/app/controllers/spree/admin/zones_controller.rb +++ b/app/controllers/spree/admin/zones_controller.rb @@ -1,7 +1,7 @@ module Spree module Admin class ZonesController < ResourceController - before_filter :load_data, :except => [:index] + before_filter :load_data, except: [:index] def new @zone.zone_members.build @@ -9,18 +9,18 @@ module Spree protected - def collection - params[:q] ||= {} - params[:q][:s] ||= "ascend_by_name" - @search = super.ransack(params[:q]) - @zones = @search.result.page(params[:page]).per(Spree::Config[:orders_per_page]) - end + def collection + params[:q] ||= {} + params[:q][:s] ||= "ascend_by_name" + @search = super.ransack(params[:q]) + @zones = @search.result.page(params[:page]).per(Spree::Config[:orders_per_page]) + end - def load_data - @countries = Country.order(:name) - @states = State.order(:name) - @zones = Zone.order(:name) - end + def load_data + @countries = Country.order(:name) + @states = State.order(:name) + @zones = Zone.order(:name) + end end end end