raggedstaff/openfoodnetwork
1
0
Fork 0
mirror of https://github.com/openfoodfoundation/openfoodnetwork synced 2026-02-08 22:56:06 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix rubocop issues in variant controller

Browse Source
This commit is contained in:
luisramos0
2019-11-11 21:43:45 +00:00
parent d153237b69
commit 836abbec92
1 changed files with 26 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

52
app/controllers/spree/admin/variants_controller.rb
View File

@@ -4,7 +4,7 @@ module Spree
module Admin
class VariantsController < ResourceController
helper 'spree/products'
belongs_to 'spree/product', :find_by => :permalink
belongs_to 'spree/product', find_by: :permalink
new_action.before :new_before
def create
@@ -13,10 +13,10 @@ module Spree
super
if @object.present? && @object.valid?
@object.on_demand = on_demand if on_demand.present?
@object.on_hand = on_hand.to_i if on_hand.present?
end
return unless @object.present? && @object.valid?
@object.on_demand = on_demand if on_demand.present?
@object.on_hand = on_hand.to_i if on_hand.present?
end
def search
@@ -27,7 +27,7 @@ module Spree
def destroy
@variant = Spree::Variant.find(params[:id])
flash[:success] = if VariantDeleter.new.delete(@variant) # This line changed
flash[:success] = if VariantDeleter.new.delete(@variant)
Spree.t('notice_messages.variant_deleted')
else
Spree.t('notice_messages.variant_not_deleted')
@@ -41,29 +41,29 @@ module Spree
protected
def create_before
option_values = params[:new_variant]
option_values.andand.each_value { |id| @object.option_values << OptionValue.find(id) }
@object.save
end
def create_before
option_values = params[:new_variant]
option_values.andand.each_value { |id| @object.option_values << OptionValue.find(id) }
@object.save
end
def new_before
@object.attributes = @object.product.master.attributes.except('id', 'created_at', 'deleted_at',
'sku', 'is_master')
# Shallow Clone of the default price to populate the price field.
@object.default_price = @object.product.master.default_price.clone
end
def new_before
@object.attributes = @object.product.master.
attributes.except('id', 'created_at', 'deleted_at', 'sku', 'is_master')
# Shallow Clone of the default price to populate the price field.
@object.default_price = @object.product.master.default_price.clone
end
def collection
@deleted = (params.key?(:deleted) && params[:deleted] == "on") ? "checked" : ""
def collection
@deleted = params.key?(:deleted) && params[:deleted] == "on" ? "checked" : ""
if @deleted.blank?
@collection ||= super
else
@collection ||= Variant.where(:product_id => parent.id).deleted
end
@collection
end
@collection ||= if @deleted.blank?
super
else
Variant.where(product_id: parent.id).deleted
end
@collection
end
end
end
end