diff --git a/.rubocop_todo.yml b/.rubocop_todo.yml index d9d6ad93db..765afe6b58 100644 --- a/.rubocop_todo.yml +++ b/.rubocop_todo.yml @@ -1427,14 +1427,6 @@ Style/GuardClause: - 'spec/support/request/distribution_helper.rb' - 'spec/support/request/shop_workflow.rb' -# Offense count: 3 -# Configuration parameters: AllowIfModifier. -Style/IfInsideElse: - Exclude: - - 'app/controllers/admin/column_preferences_controller.rb' - - 'app/controllers/admin/variant_overrides_controller.rb' - - 'app/controllers/api/taxons_controller.rb' - # Offense count: 1 Style/MissingRespondToMissing: Exclude: diff --git a/app/controllers/admin/column_preferences_controller.rb b/app/controllers/admin/column_preferences_controller.rb index 49e4bf90a5..4951a2ce5d 100644 --- a/app/controllers/admin/column_preferences_controller.rb +++ b/app/controllers/admin/column_preferences_controller.rb @@ -9,12 +9,10 @@ module Admin if @cp_set.save render json: @cp_set.collection, each_serializer: Api::Admin::ColumnPreferenceSerializer + elsif @cp_set.errors.present? + render json: { errors: @cp_set.errors }, status: :bad_request else - if @cp_set.errors.present? - render json: { errors: @cp_set.errors }, status: :bad_request - else - render nothing: true, status: :internal_server_error - end + render nothing: true, status: :internal_server_error end end diff --git a/app/controllers/admin/variant_overrides_controller.rb b/app/controllers/admin/variant_overrides_controller.rb index 16c3a48ca7..f32af6650f 100644 --- a/app/controllers/admin/variant_overrides_controller.rb +++ b/app/controllers/admin/variant_overrides_controller.rb @@ -18,12 +18,10 @@ module Admin if @vo_set.save # Return saved VOs with IDs render json: @vo_set.collection, each_serializer: Api::Admin::VariantOverrideSerializer + elsif @vo_set.errors.present? + render json: { errors: @vo_set.errors }, status: :bad_request else - if @vo_set.errors.present? - render json: { errors: @vo_set.errors }, status: :bad_request - else - render nothing: true, status: :internal_server_error - end + render nothing: true, status: :internal_server_error end end diff --git a/app/controllers/api/taxons_controller.rb b/app/controllers/api/taxons_controller.rb index cd0734054a..947e9c7350 100644 --- a/app/controllers/api/taxons_controller.rb +++ b/app/controllers/api/taxons_controller.rb @@ -7,12 +7,10 @@ module Api def index if taxonomy @taxons = taxonomy.root.children + elsif params[:ids] + @taxons = Spree::Taxon.where(id: params[:ids].split(",")) else - if params[:ids] - @taxons = Spree::Taxon.where(id: params[:ids].split(",")) - else - @taxons = Spree::Taxon.ransack(params[:q]).result - end + @taxons = Spree::Taxon.ransack(params[:q]).result end render json: @taxons, each_serializer: Api::TaxonSerializer end