Эх сурвалжийг харах

HUE-8749 [catalog] Rename has_file_search method to be generic

And not tied to Navigator
Romain Rigaux 6 жил өмнө
parent
commit
2acd475

+ 4 - 7
desktop/libs/metadata/src/metadata/catalog_api.py

@@ -20,10 +20,7 @@ import json
 import logging
 import re
 
-try:
-  from collections import OrderedDict
-except ImportError:
-  from ordereddict import OrderedDict # Python 2.6
+from collections import OrderedDict
 
 from django.http import Http404
 from django.utils.html import escape
@@ -35,7 +32,7 @@ from desktop.lib.i18n import force_unicode, smart_str
 
 from metadata.catalog.base import get_api
 from metadata.catalog.navigator_client import CatalogApiException, CatalogEntityDoesNotExistException, CatalogAuthException
-from metadata.conf import has_navigator, NAVIGATOR, has_navigator_file_search
+from metadata.conf import has_navigator, NAVIGATOR, has_catalog_file_search
 
 
 LOG = logging.getLogger(__name__)
@@ -94,7 +91,7 @@ def search_entities_interactive(request):
 
   api = get_api(request=request, interface=interface)
 
-  if sources and not has_navigator_file_search(request.user):
+  if sources and not has_catalog_file_search(request.user):
     sources = ['sql']
 
   response = api.search_entities_interactive(
@@ -140,7 +137,7 @@ def search_entities(request):
   limit = int(request.POST.get('limit', 100))
   raw_query = request.POST.get('raw_query', False)
   sources = json.loads(request.POST.get('sources') or '[]')
-  if sources and not has_navigator_file_search(request.user):
+  if sources and not has_catalog_file_search(request.user):
     sources = ['sql']
 
   query_s = query_s.strip() or '*'

+ 1 - 1
desktop/libs/metadata/src/metadata/conf.py

@@ -264,7 +264,7 @@ def get_navigator_saml_password():
   return NAVIGATOR.AUTH_SAML_PASSWORD_SCRIPT.get()
 
 
-def has_navigator_file_search(user):
+def has_catalog_file_search(user):
   return has_navigator(user) and NAVIGATOR.ENABLE_FILE_SEARCH.get()