Merge branch 'rails3' into rails3-to-master
Conflicts: app/views/suppliers/shared_suppliers.haml
This commit is contained in:
commit
71e02ab569
6 changed files with 14 additions and 6 deletions
6
app/helpers/suppliers_helper.rb
Normal file
6
app/helpers/suppliers_helper.rb
Normal file
|
|
@ -0,0 +1,6 @@
|
|||
module SuppliersHelper
|
||||
|
||||
def associated_supplier_names(shared_supplier)
|
||||
"(#{shared_supplier.suppliers.map(&:name).join(', ')})"
|
||||
end
|
||||
end
|
||||
Loading…
Add table
Add a link
Reference in a new issue