Explorar o código

HUE-6265 [home] Offer top document search even if metadata search if not available

Romain Rigaux %!s(int64=8) %!d(string=hai) anos
pai
achega
95501b72ec

+ 9 - 2
desktop/core/src/desktop/api2.py

@@ -32,6 +32,7 @@ from django.utils.translation import ugettext as _
 from django.views.decorators.csrf import ensure_csrf_cookie
 from django.views.decorators.http import require_POST
 
+from metadata.conf import has_navigator
 from metadata.navigator_api import search_entities as metadata_search_entities
 from metadata.navigator_api import search_entities_interactive as metadata_search_entities_interactive
 from notebook.connectors.base import Notebook
@@ -624,7 +625,10 @@ def search_entities(request):
 
     return JsonResponse(response)
   else:
-    return metadata_search_entities(request)
+    if has_navigator(request.user):
+      return metadata_search_entities(request)
+    else:
+      return JsonResponse({'status': 1, 'message': _('Navigator not enabled')})
 
 
 def search_entities_interactive(request):
@@ -642,7 +646,10 @@ def search_entities_interactive(request):
 
     return JsonResponse(response)
   else:
-    return metadata_search_entities_interactive(request)
+    if has_navigator(request.user) and False:
+      return metadata_search_entities_interactive(request)
+    else:
+      return JsonResponse({'status': 1, 'message': _('Navigator not enabled')})
 
 
 def _is_import_valid(documents):

+ 4 - 2
desktop/core/src/desktop/static/desktop/js/apiHelper.js

@@ -1713,8 +1713,10 @@ var ApiHelper = (function () {
         })
       ]
     ).done(function (metadata, documents) {
-      if (metadata[0].status === 0 && !self.successResponseIsError(metadata[0])) {
-    	metadata[0].resultsHuedocuments = documents[0].results;
+      if (metadata[0].status === 0 || documents[0].status === 0) {
+        if (documents[0].status === 0) {
+           metadata[0].resultsHuedocuments = documents[0].results;
+        }
         options.successCallback(metadata[0]);
       } else {
         self.assistErrorCallback(options)(metadata);