Update policies before linking to sample types

ELIXIR-Belgium · Jul 24, 2024 · c116e8c · c116e8c
1 parent 2a90c9b
commit c116e8c
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 3 deletions.
diff --git a/app/controllers/isa_assays_controller.rb b/app/controllers/isa_assays_controller.rb
@@ -44,6 +44,7 @@ def new
   end
 
   def create
+    update_sharing_policies @isa_assay.assay
     @isa_assay.sample_type.policy = @isa_assay.assay.policy
     if @isa_assay.save
       flash[:notice] = "The #{t('isa_assay')} was successfully created.<br/>".html_safe
@@ -67,6 +68,7 @@ def edit
   end
 
   def update
+    update_sharing_policies @isa_assay.assay
     @isa_assay.assay.attributes = isa_assay_params[:assay]
     @isa_assay.sample_type.policy = @isa_assay.assay.policy
     # update the sample_type

diff --git a/app/controllers/isa_studies_controller.rb b/app/controllers/isa_studies_controller.rb
@@ -11,9 +11,9 @@ def new
 
   def create
     @isa_study = IsaStudy.new(isa_study_params)
+    update_sharing_policies @isa_study.study
     @isa_study.source.policy = @isa_study.study.policy
     @isa_study.sample_collection.policy = @isa_study.study.policy
-    update_sharing_policies @isa_study.study
     @isa_study.source.contributor = User.current_user.person
     @isa_study.sample_collection.contributor = User.current_user.person
     @isa_study.study.sample_types = [@isa_study.source, @isa_study.sample_collection]
@@ -44,9 +44,9 @@ def edit
   def update
     # update the study
     @isa_study.study.attributes = isa_study_params[:study]
+    update_sharing_policies @isa_study.study
     @isa_study.source.policy = @isa_study.study.policy
     @isa_study.sample_collection.policy = @isa_study.study.policy
-    update_sharing_policies @isa_study.study
     update_relationships(@isa_study.study, isa_study_params[:study])
 
     # update the source

diff --git a/test/functional/isa_assays_controller_test.rb b/test/functional/isa_assays_controller_test.rb
@@ -560,7 +560,7 @@ def setup
 
   end
 
-  test 'Should create the same policies for the sample types' do
+  test 'Should create the same policies for the sample type' do
     person = FactoryBot.create(:person_not_in_project)
     second_person = FactoryBot.create(:person_not_in_project)
     institution = FactoryBot.create(:institution)