OpenConceptLab/ocl_issues#1860 | expansion concept cascade view | fix…

…ing conflict with uri param
OpenConceptLab · Jul 2, 2024 · 86ec64d · 86ec64d
1 parent 8ef841e
commit 86ec64d
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/core/collections/views.py b/core/collections/views.py
@@ -911,7 +911,7 @@ def apply_filters(self, queryset=None):
         count = queryset.count()
         if count == 0:
             raise Http404()
-        if count > 1:
+        if count > 1 and not uri_param:
             raise Http409()
         return queryset
 

diff --git a/core/concepts/views.py b/core/concepts/views.py
@@ -383,7 +383,7 @@ def get_object(self, queryset=None):
         if uri_param:
             queryset = queryset.filter(**Concept.get_parent_and_owner_filters_from_uri(uri_param))
 
-        if queryset.count() > 1 and 'collection' in self.kwargs:
+        if queryset.count() > 1 and not uri_param:
             raise Http409()
 
         instance = queryset.first()