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

migrate to Rails 4.0 (closes foodcoops#214)

Browse source 
Conflicts:
	Gemfile.lock
This commit is contained in:
wvengen 2014-02-20 15:04:53 +01:00
parent 12d1221bfc
commit 7841245795
97 changed files with 659 additions and 557 deletions
Download patch file Download diff file Expand all files Collapse all files

2
app/views/stock_takings/_stock_takings.html.haml
View file

@ -15,5 +15,5 @@
%td= truncate stock_taking.note
%td
= link_to t('ui.edit'), edit_stock_taking_path(stock_taking), class: 'btn btn-mini'
= link_to t('ui.delete'), stock_taking, :confirm => t('.confirm_delete'), :method => :delete,
= link_to t('ui.delete'), stock_taking, :data => {:confirm => t('.confirm_delete')}, :method => :delete,
class: 'btn btn-mini btn-danger'

4
app/views/stock_takings/show.html.haml
View file

@ -13,7 +13,7 @@
%th= t '.supplier'
%th= t '.unit'
%th= t '.amount'
- for stock_change in @stock_taking.stock_changes.all
- for stock_change in @stock_taking.stock_changes
%tr
%td= stock_change.stock_article.name
%td= stock_change.stock_article.supplier.name
@ -23,5 +23,5 @@
.btn-group
= link_to t('ui.edit'), edit_stock_taking_path(@stock_taking), class: 'btn'
= link_to t('.overview'), stock_takings_path, class: 'btn'
= link_to t('ui.delete'), @stock_taking, :method => :delete, :confirm => t('.confirm_delete'),
= link_to t('ui.delete'), @stock_taking, :method => :delete, :data => {:confirm => t('.confirm_delete')},
class: 'btn btn-danger'