Merge branch 'master' into collection_expansions

OpenConceptLab · Dec 23, 2021 · 0f9269c · 0f9269c
2 parents b88ad4f + 5246350
commit 0f9269c
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/core/common/mixins.py b/core/common/mixins.py
@@ -32,7 +32,7 @@ def __init__(self, request, total_count, queryset, page_size):
         self.request = request
         self.queryset = queryset
         self.page_size = page_size
-        self.page_number = int(request.GET.get('page', '1'))
+        self.page_number = int(request.GET.get('page', '1') or '1')
         self.paginator = Paginator(self.queryset, self.page_size)
         self.page_object = self.paginator.get_page(self.page_number)
         self.page_count = ceil(int(self.total_count) / int(self.page_size))

diff --git a/core/concepts/models.py b/core/concepts/models.py
@@ -728,7 +728,8 @@ def index_all():
 
                     transaction.on_commit(index_all)
         except ValidationError as err:
-            errors.update(err.message_dict)
+            if get(err, 'error_dict'):
+                errors.update(err.message_dict)
         finally:
             cls.resume_indexing()
             if not persisted: