aboutsummaryrefslogtreecommitdiffstats
path: root/app/controllers/referentials_controller.rb
diff options
context:
space:
mode:
authorLuc Donnet2017-07-25 22:15:35 +0200
committerLuc Donnet2017-07-25 22:15:35 +0200
commitcbfe9501f2d2cfc38cbe6ac12180e372dd78eca7 (patch)
treedbe70647c87af0d779dbba06e20d0f0c2b4a294a /app/controllers/referentials_controller.rb
parentea3ad8d1f9db76e3d2dfc5f96c930af8db074690 (diff)
parentcada0f02d732dce25492d7f7eb6d6232d56188dd (diff)
downloadchouette-core-cbfe9501f2d2cfc38cbe6ac12180e372dd78eca7.tar.bz2
Merge branch 'master' into staging
Diffstat (limited to 'app/controllers/referentials_controller.rb')
-rw-r--r--app/controllers/referentials_controller.rb4
1 files changed, 2 insertions, 2 deletions
diff --git a/app/controllers/referentials_controller.rb b/app/controllers/referentials_controller.rb
index 838c46168..afd376092 100644
--- a/app/controllers/referentials_controller.rb
+++ b/app/controllers/referentials_controller.rb
@@ -9,7 +9,7 @@ class ReferentialsController < BreadcrumbController
def new
if params[:from]
source_referential = Referential.find(params[:from])
- @referential = Referential.new_from(source_referential, organisation: current_organisation)
+ @referential = Referential.new_from(source_referential)
end
new! do
@@ -118,7 +118,7 @@ class ReferentialsController < BreadcrumbController
end
def create_resource(referential)
- referential.organisation = current_organisation unless referential.created_from
+ referential.organisation = current_organisation
referential.ready = true
super
end