summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authormr <mr@mrautenberg.de>2011-05-05 11:08:46 +0200
committermr <mr@mrautenberg.de>2011-05-05 11:08:46 +0200
commit6f161255e47a2198624ae1bc7149b45a07a32bc9 (patch)
treeba140ddf53208d8840a94ff81cc8f7cd1a28c694
parentacae55da78f188adb2483fae249d319bf47e6e19 (diff)
parent3dffd2e9c7be22e1519905622129cc3d9a80ded3 (diff)
Merge branch 'hotfix/fix_external_datasets_seletion'
-rw-r--r--application.rb8
1 files changed, 6 insertions, 2 deletions
diff --git a/application.rb b/application.rb
index 44adf89..7bf1059 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