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

Merge branch 'master' into tests-rspec

Browse source 
Conflicts:
	Gemfile
This commit is contained in:
wvengen 2013-09-07 01:11:24 +02:00
commit 7de57715f2
21 changed files with 2010 additions and 72 deletions
Download patch file Download diff file Expand all files Collapse all files

4
app/views/suppliers/shared_suppliers.haml
View file

@ -17,7 +17,9 @@
%td= shared_supplier.note
%td= shared_supplier.delivery_days
%td
- if shared_supplier.supplier
- if shared_supplier.suppliers.any?
%i.icon-ok
= associated_supplier_names(shared_supplier)
= link_to t('.subscribe_again'), new_supplier_path(:shared_supplier_id => shared_supplier), class: 'btn'
- else
= link_to t('.subscribe'), new_supplier_path(:shared_supplier_id => shared_supplier), class: 'btn'