Merge branch 'rails3-allow-multiple-suppliers' of git://github.com/foodcoop-rostock/foodsoft into foodcoop-rostock-rails3-allow-multiple-suppliers

This commit is contained in:
Benjamin Meichsner 2013-06-12 10:40:20 +02:00
commit 25fbb47320
4 changed files with 8 additions and 6 deletions

View file

@ -22,7 +22,9 @@
%td= shared_supplier.note
%td= shared_supplier.delivery_days
%td
- if shared_supplier.supplier
- if shared_supplier.suppliers
%i.icon-ok
= '(' + shared_supplier.suppliers.map{|s| s.name}.join(', ') + ')'
= link_to "abonnieren", new_supplier_path(:shared_supplier_id => shared_supplier), class: 'btn'
- else
= link_to "abonnieren", new_supplier_path(:shared_supplier_id => shared_supplier), class: 'btn'
= link_to "abonnieren", new_supplier_path(:shared_supplier_id => shared_supplier), class: 'btn'