Pārlūkot izejas kodu

HUE-9066 [desktop] Move __paginate util to the model instead of api module

Romain 6 gadi atpakaļ
vecāks
revīzija
9ad9b51ac0

+ 1 - 15
desktop/core/src/desktop/api2.py

@@ -49,7 +49,7 @@ from desktop.lib.exceptions_renderable import PopupException
 from desktop.lib.export_csvxls import make_response
 from desktop.lib.i18n import smart_str, force_unicode
 from desktop.models import Document2, Document, Directory, FilesystemException, uuid_default, \
-  UserPreferences, get_user_preferences, set_user_preferences, get_cluster_config
+  UserPreferences, get_user_preferences, set_user_preferences, get_cluster_config, __paginate
 
 if sys.version_info[0] > 2:
   from io import StringIO as string_io
@@ -1098,17 +1098,3 @@ def _paginate(request, queryset):
   limit = int(request.GET.get('limit', 0))
 
   return __paginate(page, limit, queryset)
-
-
-def __paginate(page, limit, queryset):
-
-  if limit > 0:
-    offset = (page - 1) * limit
-    last = offset + limit
-    queryset = queryset.all()[offset:last]
-
-  return {
-    'documents': queryset,
-    'page': page,
-    'limit': limit
-  }

+ 14 - 0
desktop/core/src/desktop/models.py

@@ -2057,3 +2057,17 @@ def get_data_link(meta):
     link = '/metastore/table/%(database)s/%(table)s' % meta # Could also add col=val
 
   return link
+
+
+def __paginate(page, limit, queryset):
+
+  if limit > 0:
+    offset = (page - 1) * limit
+    last = offset + limit
+    queryset = queryset.all()[offset:last]
+
+  return {
+    'documents': queryset,
+    'page': page,
+    'limit': limit
+  }

+ 1 - 2
desktop/libs/notebook/src/notebook/api.py

@@ -30,11 +30,10 @@ from django.views.decorators.http import require_GET, require_POST
 import opentracing.tracer
 
 from azure.abfs.__init__ import abfspath
-from desktop.api2 import __paginate
 from desktop.conf import TASK_SERVER
 from desktop.lib.i18n import smart_str
 from desktop.lib.django_util import JsonResponse
-from desktop.models import Document2, Document
+from desktop.models import Document2, Document, __paginate
 from indexer.file_format import HiveFormat
 from indexer.fields import Field