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

@ -206,7 +206,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