end of day commit

This commit is contained in:
2014-08-28 18:45:27 +02:00
parent 14791df379
commit aac47d3b51
2 changed files with 2 additions and 3 deletions
@@ -19,7 +19,7 @@ App.ProductOrdersController = Ember.ArrayController.extend
#error = @ajaxError (jqXHR)=> #error = @ajaxError (jqXHR)=>
#new_product_orders.invoke 'eraseRecord' #new_product_orders.invoke 'eraseRecord'
#@redirect_to 'index', message: 'order_could_not_be_processed' #@redirect_to 'index', message: 'order_could_not_be_processed'
order.save().then (response)=> order.save().then (response)=>
new_product_orders.invoke 'eraseRecord' new_product_orders.invoke 'eraseRecord'
if @get('controllers.application.list') if @get('controllers.application.list')
@@ -29,7 +29,6 @@ App.ProductOrdersController = Ember.ArrayController.extend
@get('controllers.application').setCurrentList -> @get('controllers.application').setCurrentList ->
@transitionToRoute 'active_list' @transitionToRoute 'active_list'
, @ajaxError (jqXHR)=> , @ajaxError (jqXHR)=>
debugger
new_product_orders.invoke 'eraseRecord' new_product_orders.invoke 'eraseRecord'
@redirect_to 'index', message: 'order_could_not_be_processed' @redirect_to 'index', message: 'order_could_not_be_processed'
#orders = @store.all('product_order').toArray() #orders = @store.all('product_order').toArray()
@@ -16,7 +16,7 @@ end
step "the user should see the supplier menu having the other table as base" do step "the user should see the supplier menu having the other table as base" do
#route_should_be 'user#list_products' #route_should_be 'user#list_products'
page.should have_content 'Apple pie' page.should have_content 'Apple pie'
find('.table-number').text.should == "Tafel #{@other_table.number.to_s}" all('.table-number').map(&:text).uniq.should == ["# #{@other_table.number.to_s}"]
end end
step "the user list should have been moved to the other table" do step "the user list should have been moved to the other table" do