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

Can add an image from redesigned new product page

Browse Source
This commit is contained in:
Rob H
2014-05-30 11:31:53 +10:00
parent 9b10a2cb94
commit d9f7865572
3 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
app/models/spree/product_decorator.rb
View File

@@ -4,7 +4,6 @@ Spree::Product.class_eval do
# https://github.com/rails/rails/issues/7618
has_many :option_types, :through => :product_option_types, :dependent => :destroy
belongs_to :supplier, :class_name => 'Enterprise'
has_many :product_distributions, :dependent => :destroy
@@ -12,8 +11,9 @@ Spree::Product.class_eval do
accepts_nested_attributes_for :product_distributions, :allow_destroy => true
delegate_belongs_to :master, :unit_value, :unit_description
delegate :images_attributes=, to: :master
attr_accessible :supplier_id, :distributor_ids, :product_distributions_attributes, :group_buy, :group_buy_unit_size, :variant_unit, :variant_unit_scale, :variant_unit_name, :unit_value, :unit_description, :notes
attr_accessible :supplier_id, :distributor_ids, :product_distributions_attributes, :group_buy, :group_buy_unit_size, :variant_unit, :variant_unit_scale, :variant_unit_name, :unit_value, :unit_description, :notes, :images_attributes
validates_presence_of :supplier

3
app/models/spree/variant_decorator.rb
View File

@@ -2,7 +2,8 @@ Spree::Variant.class_eval do
has_many :exchange_variants, dependent: :destroy
has_many :exchanges, through: :exchange_variants
attr_accessible :unit_value, :unit_description
attr_accessible :unit_value, :unit_description, :images_attributes
accepts_nested_attributes_for :images
validates_presence_of :unit_value,
if: -> v { %w(weight volume).include? v.product.variant_unit },

5
app/overrides/spree/admin/products/new/replace_form.html.haml.deface
View File

@@ -66,7 +66,8 @@
.row
= image_tag "noimage/product.png", class: "four columns alpha"
.row
= button "Select An image"
= f.fields_for 'images_attributes[]', f.object.images.build do |image_fields|
= image_fields.file_field :attachment
.sixteen.columns.alpha
.form-buttons.filter-actions.actions{ 'data-hook' => "buttons" }
= button t('actions.create'), 'icon-ok', :submit, value: "create"
@@ -78,8 +79,6 @@
= link_to_with_icon 'icon-remove', t('actions.cancel'), collection_url, :class => 'button'
:javascript
angular.element(document.getElementById("new_product")).ready(function() {
angular.bootstrap(document.getElementById("new_product"), ['admin.products']);