Skip to content

update for 2.2 => fix install generator for assets path #2

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
connecticus wants to merge 2 commits into
base: master
Choose a base branch
from
Open

update for 2.2 => fix install generator for assets path #2

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ec5eb33
update for 2.2 => fix install generator for assets path
Feb 23, 2015
da5289f
trash rm
Mar 15, 2015
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion app/assets/javascripts/admin/spree_variant_properties.js
View file
Open in desktop

This file was deleted.

1 change: 1 addition & 0 deletions app/assets/javascripts/spree/backend/spree_variant_properties.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
//= require spree/backend
2 changes: 2 additions & 0 deletions app/assets/javascripts/spree/frontend/spree_variant_properties.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
//= require spree/frontend
//= require ./variant_properties
0 ...cripts/store/variant_properties.js.coffee → ...ree/frontend/variant_properties.js.coffee
View file
Open in desktop
File renamed without changes.
2 changes: 0 additions & 2 deletions app/assets/javascripts/store/spree_variant_properties.js
View file
Open in desktop

This file was deleted.

3 changes: 0 additions & 3 deletions app/assets/stylesheets/admin/spree_variant_properties.css
View file
Open in desktop

This file was deleted.

3 changes: 3 additions & 0 deletions app/assets/stylesheets/spree/backend/spree_variant_properties.css
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
/*
*= require spree/backend
*/
3 changes: 3 additions & 0 deletions app/assets/stylesheets/spree/frontend/spree_variant_properties.css
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
/*
*= require spree/frontend
*/
3 changes: 0 additions & 3 deletions app/assets/stylesheets/store/spree_variant_properties.css
View file
Open in desktop

This file was deleted.

2 changes: 0 additions & 2 deletions app/controllers/spree/products_controller_decorator.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
8 changes: 4 additions & 4 deletions lib/generators/spree_variant_properties/install/install_generator.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion spree_variant_properties.gemspec
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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'
Expand Down