Foodsoft/foodsoft
1
1
Fork 0
Code Issues 36 Pull requests 5 Projects 1 Releases Wiki Activity

Revert some changes of 20adce8a4e2d32548e7d7016dace250dd3e2eb9b

Browse source
This commit is contained in:
Julius 2014-01-01 16:54:49 +01:00 committed by wvengen
parent 033aa90698
commit a384532619
2 changed files with 1 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
app/controllers/order_articles_controller.rb
View file

@ -18,7 +18,7 @@ class OrderArticlesController < ApplicationController
if @order_article and @order_article.units_to_order == 0 if @order_article and @order_article.units_to_order == 0
@order_article.units_to_order = 1 # FIXME: this is ugly if used in the receive form @order_article.units_to_order = 1 # FIXME: this is ugly if used in the receive form
else else
@order_article = OrderArticle.new(params[:order_article]) @order_article = @order.order_articles.build(params[:order_article])
end end
@order_article.save! @order_article.save!
rescue rescue

1
app/views/order_articles/_new.html.haml
View file

@ -1,5 +1,4 @@
= simple_form_for [@order, @order_article], remote: true do |form| = simple_form_for [@order, @order_article], remote: true do |form|
= form.association :order, as: :hidden
.modal-header .modal-header
= link_to t('ui.marks.close').html_safe, '#', class: 'close', data: {dismiss: 'modal'} = link_to t('ui.marks.close').html_safe, '#', class: 'close', data: {dismiss: 'modal'}
%h3= t '.title' %h3= t '.title'