From 86ec64d7609eec7595e474ef58c607aa7f576f7a Mon Sep 17 00:00:00 2001 From: Sny Date: Tue, 2 Jul 2024 10:29:20 +0530 Subject: [PATCH] OpenConceptLab/ocl_issues#1860 | expansion concept cascade view | fixing conflict with uri param --- core/collections/views.py | 2 +- core/concepts/views.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/core/collections/views.py b/core/collections/views.py index c9180c0d..aaf371e4 100644 --- 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 index 12c33433..7a7866f5 100644 --- 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()