Merge branch 'hotfix/fix_external_datasets_seletion' into development

1 files changed, 6 insertions, 2 deletions

diff --git a/application.rb b/application.rb
index c261437..0123585 100644
--- a/application.rb
+++ b/application.rb
@@ -37,9 +37,13 @@ helpers do
       task.progress(60)
       delete_dependent(model.validation_qmrf_uri, subjectid) if model.validation_qmrf_uri
       task.progress(75)
-      delete_dependent(model.training_dataset, subjectid) if model.training_dataset
+      if model.training_dataset
+        delete_dependent(model.training_dataset, subjectid) if model.training_dataset.match(CONFIG[:services]["opentox-dataset"])
+      end 
       task.progress(90)
-      delete_dependent(model.feature_dataset, subjectid) if model.feature_dataset
+      if model.feature_dataset
+        delete_dependent(model.feature_dataset, subjectid) if model.feature_dataset.match(CONFIG[:services]["opentox-dataset"])
+      end
       task.progress(100)
       ""
     end