Merge branch 'rails3' into rails3-to-master

Conflicts:
	app/views/suppliers/shared_suppliers.haml
This commit is contained in:
Benjamin Meichsner 2013-09-02 13:31:40 +02:00
commit 71e02ab569
6 changed files with 14 additions and 6 deletions

View file

@ -0,0 +1,6 @@
module SuppliersHelper
def associated_supplier_names(shared_supplier)
"(#{shared_supplier.suppliers.map(&:name).join(', ')})"
end
end