OpenConceptLab/ocl_issues#45 | not validating retired concept locales

OpenConceptLab · Aug 5, 2021 · 8c1be68 · 8c1be68
1 parent 90745d7
commit 8c1be68
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 0 deletions.
diff --git a/core/concepts/custom_validators.py b/core/concepts/custom_validators.py
@@ -21,6 +21,8 @@ def __init__(self, **kwargs):
         self.reference_values = kwargs.pop('reference_values')
 
     def validate_concept_based(self, concept):
+        if concept.retired:
+            return
         self.must_have_exactly_one_preferred_name(concept)
         self.all_non_short_names_must_be_unique(concept)
         self.no_more_than_one_short_name_per_locale(concept)
@@ -30,6 +32,8 @@ def validate_concept_based(self, concept):
         self.lookup_attributes_should_be_valid(concept)
 
     def validate_source_based(self, concept):
+        if concept.retired:
+            return
         self.fully_specified_name_should_be_unique_for_source_and_locale(concept)
         self.preferred_name_should_be_unique_for_source_and_locale(concept)
 

diff --git a/core/concepts/validators.py b/core/concepts/validators.py
@@ -83,6 +83,8 @@ def validate_source_based(self, concept):
 
 class BasicConceptValidator(BaseConceptValidator):
     def validate_concept_based(self, concept):
+        if concept.retired:
+            return
         self.description_cannot_be_null(concept)
         self.must_have_at_least_one_name(concept)