diff --git a/Gemfile b/Gemfile index 1792d212..f95c7b95 100644 --- a/Gemfile +++ b/Gemfile @@ -105,22 +105,21 @@ group :development, :test do gem 'test_squad' gem 'factory_girl_rails' end - group :development do gem 'quiet_assets' gem 'letter_opener' # gem 'thin' gem 'faye' + gem 'spring' + gem 'spring-commands-rspec' + gem 'web-console', '~> 2.0.0' + gem 'foreman' gem 'capistrano', require: false gem 'capistrano-bundler', require: false gem 'capistrano-rvm', require: false gem 'capistrano-rails', require: false gem 'capistrano3-puma', require: false gem "airbrussh", require: false - gem 'spring' - gem 'spring-commands-rspec' - gem 'web-console', '~> 2.0.0' - gem 'foreman' end group :test do diff --git a/app/assets/javascripts/supplier/app/controllers/index_controller.js.coffee b/app/assets/javascripts/supplier/app/controllers/index_controller.js.coffee index e4c4e345..ab66192d 100644 --- a/app/assets/javascripts/supplier/app/controllers/index_controller.js.coffee +++ b/app/assets/javascripts/supplier/app/controllers/index_controller.js.coffee @@ -5,7 +5,7 @@ App.IndexController = Ember.Controller.extend orders: Ember.computed -> @store.peekAll('order') sections: (-> @store.peekAll('section')).property() active_section: Ember.computed.alias 'globals.active_section' - active_lists: Ember.computed 'lists.@each.state', 'active_section.id', -> + active_lists: Ember.computed 'lists.@each.state', 'active_section.id', 'lists.@each.table', -> @get('orders') # trigger orders, otherwise observers are not initialized/triggered (active_orders) if section_id = @get('active_section.id') lists = @get('lists').filter (l)=>( l.get('section.id') == section_id && l.get('state') == 'active' ) diff --git a/config/application.rb b/config/application.rb index c0b13881..8d9687a9 100644 --- a/config/application.rb +++ b/config/application.rb @@ -13,13 +13,8 @@ require 'sprockets/railtie' require File.expand_path('./../../lib/couchbase-setting', __FILE__) -if defined?(Bundler) - # If you precompile assets before deploying to production, use this line - Bundler.require(*Rails.groups(assets: %w(development test user_app))) - Bundler.require(:assets) if ENV['DEPLOY']=='yes' - # If you want your assets lazily compiled in production, use this line - # Bundler.require(:default, :assets, Rails.env) -end +Bundler.require(*Rails.groups(assets: %w(development test user_app))) +Bundler.require(:assets) if ENV['DEPLOY']=='yes' require 'simply_stored' module SimplyStored