From ec5eb339eab5d2c4ea1c11e55145b3066f80defb Mon Sep 17 00:00:00 2001 From: "k@connecticus.org" Date: Sun, 22 Feb 2015 19:55:25 -0800 Subject: [PATCH 1/2] update for 2.2 => fix install generator for assets path --- app/assets/javascripts/admin/spree_variant_properties.js | 1 - .../javascripts/spree/backend/spree_variant_properties.js | 1 + .../spree/frontend/spree_variant_properties.js | 2 ++ .../frontend}/variant_properties.js.coffee | 0 app/assets/javascripts/store/spree_variant_properties.js | 2 -- app/assets/stylesheets/admin/spree_variant_properties.css | 3 --- .../spree/backend/spree_variant_properties.css | 3 +++ .../spree/frontend/spree_variant_properties.css | 3 +++ app/assets/stylesheets/store/spree_variant_properties.css | 3 --- .../spree_variant_properties/install/install_generator.rb | 8 ++++---- 10 files changed, 13 insertions(+), 13 deletions(-) delete mode 100644 app/assets/javascripts/admin/spree_variant_properties.js create mode 100644 app/assets/javascripts/spree/backend/spree_variant_properties.js create mode 100644 app/assets/javascripts/spree/frontend/spree_variant_properties.js rename app/assets/javascripts/{store => spree/frontend}/variant_properties.js.coffee (100%) delete mode 100644 app/assets/javascripts/store/spree_variant_properties.js delete mode 100644 app/assets/stylesheets/admin/spree_variant_properties.css create mode 100644 app/assets/stylesheets/spree/backend/spree_variant_properties.css create mode 100644 app/assets/stylesheets/spree/frontend/spree_variant_properties.css delete mode 100644 app/assets/stylesheets/store/spree_variant_properties.css diff --git a/app/assets/javascripts/admin/spree_variant_properties.js b/app/assets/javascripts/admin/spree_variant_properties.js deleted file mode 100644 index b181e56..0000000 --- a/app/assets/javascripts/admin/spree_variant_properties.js +++ /dev/null @@ -1 +0,0 @@ -//= require admin/spree_backend diff --git a/app/assets/javascripts/spree/backend/spree_variant_properties.js b/app/assets/javascripts/spree/backend/spree_variant_properties.js new file mode 100644 index 0000000..1424ae2 --- /dev/null +++ b/app/assets/javascripts/spree/backend/spree_variant_properties.js @@ -0,0 +1 @@ +//= require spree/backend diff --git a/app/assets/javascripts/spree/frontend/spree_variant_properties.js b/app/assets/javascripts/spree/frontend/spree_variant_properties.js new file mode 100644 index 0000000..d56ee5a --- /dev/null +++ b/app/assets/javascripts/spree/frontend/spree_variant_properties.js @@ -0,0 +1,2 @@ +//= require spree/frontend +//= require ./variant_properties diff --git a/app/assets/javascripts/store/variant_properties.js.coffee b/app/assets/javascripts/spree/frontend/variant_properties.js.coffee similarity index 100% rename from app/assets/javascripts/store/variant_properties.js.coffee rename to app/assets/javascripts/spree/frontend/variant_properties.js.coffee diff --git a/app/assets/javascripts/store/spree_variant_properties.js b/app/assets/javascripts/store/spree_variant_properties.js deleted file mode 100644 index 26e54a3..0000000 --- a/app/assets/javascripts/store/spree_variant_properties.js +++ /dev/null @@ -1,2 +0,0 @@ -//= require store/spree_frontend -//= require store/variant_properties diff --git a/app/assets/stylesheets/admin/spree_variant_properties.css b/app/assets/stylesheets/admin/spree_variant_properties.css deleted file mode 100644 index ff89c72..0000000 --- a/app/assets/stylesheets/admin/spree_variant_properties.css +++ /dev/null @@ -1,3 +0,0 @@ -/* - *= require admin/spree_backend -*/ diff --git a/app/assets/stylesheets/spree/backend/spree_variant_properties.css b/app/assets/stylesheets/spree/backend/spree_variant_properties.css new file mode 100644 index 0000000..a5cec98 --- /dev/null +++ b/app/assets/stylesheets/spree/backend/spree_variant_properties.css @@ -0,0 +1,3 @@ +/* + *= require spree/backend +*/ diff --git a/app/assets/stylesheets/spree/frontend/spree_variant_properties.css b/app/assets/stylesheets/spree/frontend/spree_variant_properties.css new file mode 100644 index 0000000..ad7db30 --- /dev/null +++ b/app/assets/stylesheets/spree/frontend/spree_variant_properties.css @@ -0,0 +1,3 @@ +/* + *= require spree/frontend +*/ diff --git a/app/assets/stylesheets/store/spree_variant_properties.css b/app/assets/stylesheets/store/spree_variant_properties.css deleted file mode 100644 index bce0f84..0000000 --- a/app/assets/stylesheets/store/spree_variant_properties.css +++ /dev/null @@ -1,3 +0,0 @@ -/* - *= require store/spree_frontend -*/ diff --git a/lib/generators/spree_variant_properties/install/install_generator.rb b/lib/generators/spree_variant_properties/install/install_generator.rb index 5d94035..1e71703 100644 --- a/lib/generators/spree_variant_properties/install/install_generator.rb +++ b/lib/generators/spree_variant_properties/install/install_generator.rb @@ -5,13 +5,13 @@ class InstallGenerator < Rails::Generators::Base class_option :auto_run_migrations, :type => :boolean, :default => false def add_javascripts - append_file 'app/assets/javascripts/store/all.js', "//= require store/spree_variant_properties\n" - append_file 'app/assets/javascripts/admin/all.js', "//= require admin/spree_variant_properties\n" + append_file 'vendor/assets/javascripts/spree/frontend/all.js', "//= require spree/frontend/spree_variant_properties\n" + append_file 'vendor/assets/javascripts/spree/backend/all.js', "//= require spree/backend/spree_variant_properties\n" end def add_stylesheets - inject_into_file 'app/assets/stylesheets/store/all.css', " *= require store/spree_variant_properties\n", :before => /\*\//, :verbose => true - inject_into_file 'app/assets/stylesheets/admin/all.css', " *= require admin/spree_variant_properties\n", :before => /\*\//, :verbose => true + inject_into_file 'vendor/assets/stylesheets/spree/frontend/all.css', " *= require spree/frontend/spree_variant_properties\n", :before => /\*\//, :verbose => true + inject_into_file 'vendor/assets/stylesheets/spree/backend/all.css', " *= require spree/backend/spree_variant_properties\n", :before => /\*\//, :verbose => true end def add_migrations From da5289f2aec20de00eab4f7ae131a7d3516fb85e Mon Sep 17 00:00:00 2001 From: Stanislav Bourakov Date: Sat, 14 Mar 2015 23:56:42 -0700 Subject: [PATCH 2/2] trash rm --- app/controllers/spree/products_controller_decorator.rb | 2 -- spree_variant_properties.gemspec | 2 +- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/app/controllers/spree/products_controller_decorator.rb b/app/controllers/spree/products_controller_decorator.rb index 7fbfef9..f4485c6 100644 --- a/app/controllers/spree/products_controller_decorator.rb +++ b/app/controllers/spree/products_controller_decorator.rb @@ -11,8 +11,6 @@ def show @variants = @product.variants_including_master.active(current_currency).includes([:option_values, :images]) @product_properties = @product.product_properties.includes(:property) - related_products_ids = @product.relations.pluck(:related_to_id) - @related_products = Spree::Product.find_all_by_id(related_products_ids) @variant_properties = @product.variants.first.variant_properties if @product.variants.first diff --git a/spree_variant_properties.gemspec b/spree_variant_properties.gemspec index 7c364fd..455f0c1 100644 --- a/spree_variant_properties.gemspec +++ b/spree_variant_properties.gemspec @@ -16,7 +16,7 @@ Gem::Specification.new do |s| s.require_path = 'lib' s.requirements << 'none' - s.add_dependency 'spree_core', '~> 2.2.5.beta' + s.add_dependency 'spree_core', '~> 2.4' s.add_development_dependency 'capybara', '~> 2.1' s.add_development_dependency 'coffee-rails'