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

HUE-5521 [editor] Update to use get_ordered_interpreters

Romain Rigaux 9 жил өмнө
parent
commit
36851b4979

+ 2 - 2
desktop/core/src/desktop/views.py

@@ -39,7 +39,7 @@ from django.views.decorators.http import require_http_methods, require_POST
 import django.views.debug
 import django.views.debug
 
 
 from aws.conf import is_enabled as is_s3_enabled, has_s3_access
 from aws.conf import is_enabled as is_s3_enabled, has_s3_access
-from notebook.conf import get_interpreters
+from notebook.conf import get_ordered_interpreters
 
 
 import desktop.conf
 import desktop.conf
 import desktop.log.log_buffer
 import desktop.log.log_buffer
@@ -73,7 +73,7 @@ def responsive(request):
   return render('responsive.mako', request, {
   return render('responsive.mako', request, {
     'apps': apps,
     'apps': apps,
     'tours_and_tutorials': Settings.get_settings().tours_and_tutorials,
     'tours_and_tutorials': Settings.get_settings().tours_and_tutorials,
-    'interpreters': get_interpreters(request.user),
+    'interpreters': get_ordered_interpreters(request.user),
     'is_s3_enabled': is_s3_enabled() and has_s3_access(request.user),
     'is_s3_enabled': is_s3_enabled() and has_s3_access(request.user),
     'is_ldap_setup': 'desktop.auth.backend.LdapBackend' in desktop.conf.AUTH.BACKEND.get()
     'is_ldap_setup': 'desktop.auth.backend.LdapBackend' in desktop.conf.AUTH.BACKEND.get()
   })
   })

+ 2 - 2
desktop/libs/notebook/src/notebook/views.py

@@ -114,7 +114,7 @@ def editor(request, is_mobile=False, is_embeddable=False):
       'notebooks_json': '{}',
       'notebooks_json': '{}',
       'editor_type': editor_type,
       'editor_type': editor_type,
       'options_json': json.dumps({
       'options_json': json.dumps({
-        'languages': get_interpreters(request.user),
+        'languages': get_ordered_interpreters(request.user),
         'mode': 'editor',
         'mode': 'editor',
         'is_optimizer_enabled': has_optimizer(),
         'is_optimizer_enabled': has_optimizer(),
         'is_navigator_enabled': has_navigator(request.user),
         'is_navigator_enabled': has_navigator(request.user),
@@ -146,7 +146,7 @@ def browse(request, database, table):
   return render('editor.mako', request, {
   return render('editor.mako', request, {
       'notebooks_json': json.dumps([editor.get_data()]),
       'notebooks_json': json.dumps([editor.get_data()]),
       'options_json': json.dumps({
       'options_json': json.dumps({
-          'languages': get_interpreters(request.user),
+          'languages': get_ordered_interpreters(request.user),
           'mode': 'editor',
           'mode': 'editor',
           'editor_type': editor_type
           'editor_type': editor_type
       }),
       }),