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/articles_controller.rb
View file

@ -209,7 +209,7 @@ class ArticlesController < ApplicationController
# fills a form whith values of the selected shared_article
def import
@article = SharedArticle.find(params[:shared_article_id]).build_new_article
@article = SharedArticle.find(params[:shared_article_id]).build_new_article(@supplier)
render :action => 'new', :layout => false
end