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

Merge remote-tracking branch 'bennibu/rails3' into rails3

Browse source 
Conflicts:
	app/controllers/articles_controller.rb
	app/views/articles/_form.html.haml
	app/views/articles/sync.html.haml
	app/views/finance/balancing/_edit_note.html.haml
	app/views/finance/group_order_articles/_form.html.haml
	app/views/finance/order_articles/_edit.html.haml
	app/views/finance/order_articles/_new.html.haml
	app/views/group_orders/show.html.haml
	app/views/invites/_modal_form.html.haml
This commit is contained in:
wvengen 2013-04-12 15:45:24 +02:00
commit f6ba21832d
15 changed files with 71 additions and 33 deletions
Download patch file Download diff file Expand all files Collapse all files

4
app/views/finance/group_order_articles/_form.html.haml
View file

@ -1,11 +1,11 @@
= simple_form_for [:finance, @group_order_article], remote: true do |form|
= form.hidden_field :order_article_id
.modal-header
= button_tag "x", class: 'close', data: {dismiss: 'modal'}
= link_to t('ui.marks.close').html_safe, '#', class: 'close', data: {dismiss: 'modal'}
%h3= t('.amount_change_for', article: @order_article.article.name)
.modal-body
= form.input :ordergroup_id, as: :select, collection: Ordergroup.all.map { |g| [g.name, g.id] }
= form.input :result, hint: "Einheit: #{@order_article.article.unit}"
.modal-footer
= button_tag t('ui.close'), class: 'btn', data: {dismiss: 'modal'}
= link_to t('ui.close'), '#', class: 'btn', data: {dismiss: 'modal'}
= form.submit t('ui.save'), class: 'btn btn-primary'