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

Merge branch 'rails3' into rails3-to-master

Browse source 
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
Download patch file Download diff file Expand all files Collapse all files

2
app/controllers/suppliers_controller.rb
View file

@ -18,7 +18,7 @@ class SuppliersController < ApplicationController
def new
if params[:shared_supplier_id]
shared_supplier = SharedSupplier.find(params[:shared_supplier_id])
@supplier = shared_supplier.build_supplier(shared_supplier.autofill_attributes)
@supplier = shared_supplier.suppliers.new(shared_supplier.autofill_attributes)
else
@supplier = Supplier.new
end