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/suppliers/index.haml
View file

@ -24,4 +24,4 @@
%td
= link_to t('ui.edit'), edit_supplier_path(supplier), class: 'btn btn-mini'
= link_to t('ui.delete'), supplier_path(supplier), method: :delete,
confirm: t('.confirm_del', name: supplier.name), class: 'btn btn-mini btn-danger'
:data => {confirm: t('.confirm_del', name: supplier.name)}, class: 'btn btn-mini btn-danger'

2
app/views/suppliers/show.haml
View file

@ -36,7 +36,7 @@
- if @current_user.role_suppliers?
.form-actions
= link_to t('ui.edit'), edit_supplier_path(@supplier), class: 'btn'
= link_to t('ui.delete'), @supplier, :confirm => t('.confirm_delete'), :method => :delete, class: 'btn btn-danger'
= link_to t('ui.delete'), @supplier, :data => {:confirm => t('.confirm_delete')}, :method => :delete, class: 'btn btn-danger'
.span6
%h2= t '.last_deliveries'