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/articles/_form.html.haml
View file

@ -2,7 +2,7 @@
= f.hidden_field :shared_updated_on
= f.hidden_field :supplier_id
.modal-header
= button_tag 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'
.modal-body
= f.input :availability
@ -19,6 +19,6 @@
= f.input :tax
= f.input :deposit
.modal-footer
= button_tag t('ui.close'), class: 'btn', data: {dismiss: 'modal'}
= link_to t('ui.close'), '#', class: 'btn', data: {dismiss: 'modal'}
= f.submit class: 'btn btn-primary'

5
app/views/articles/sync.html.haml
View file

@ -1,6 +1,6 @@
- title 'Artikel mit externer Datenbank synchronisieren'
= form_tag update_all_supplier_articles_path(@supplier, :sync => "1") do
= form_tag update_synchronized_supplier_articles_path(@supplier) do
%h2= t '.outlist.title'
%p
- unless @outlisted_articles.empty?
@ -10,6 +10,9 @@
%li
= hidden_field_tag "outlisted_articles[#{article.id}]", '1'
= article.name
- if article.in_open_order
.alert
Achtung, #{article.name} wird gerade in einer laufenden Bestellung verwendet. Bitte erst Bestellung anpassen.
- else
%i= t '.outlist.body_skip'
%hr/