浏览代码

HUE-8530 [organization] Fix import lost during the rebase

Romain 6 年之前
父节点
当前提交
d39a4073af
共有 2 个文件被更改,包括 4 次插入5 次删除
  1. 3 4
      desktop/core/src/desktop/models.py
  2. 1 1
      desktop/core/src/desktop/templates/login.mako

+ 3 - 4
desktop/core/src/desktop/models.py

@@ -41,19 +41,18 @@ from django.urls import reverse, NoReverseMatch
 from django.utils.translation import ugettext as _, ugettext_lazy as _t
 from django.utils.translation import ugettext as _, ugettext_lazy as _t
 
 
 from dashboard.conf import get_engines, HAS_REPORT_ENABLED
 from dashboard.conf import get_engines, HAS_REPORT_ENABLED
-from desktop.settings import HUE_DESKTOP_VERSION
 from kafka.conf import has_kafka
 from kafka.conf import has_kafka
 from notebook.conf import SHOW_NOTEBOOKS, get_ordered_interpreters
 from notebook.conf import SHOW_NOTEBOOKS, get_ordered_interpreters
-from settings import HUE_DESKTOP_VERSION
 
 
 from desktop import appmanager
 from desktop import appmanager
 from desktop.auth.backend import is_admin
 from desktop.auth.backend import is_admin
+from desktop.conf import ENABLE_ORGANIZATIONS, get_clusters, CLUSTER_ID, IS_MULTICLUSTER_ONLY
 from desktop.lib import fsmanager
 from desktop.lib import fsmanager
 from desktop.lib.i18n import force_unicode
 from desktop.lib.i18n import force_unicode
 from desktop.lib.exceptions_renderable import PopupException
 from desktop.lib.exceptions_renderable import PopupException
 from desktop.lib.paths import get_run_root, SAFE_CHARACTERS_URI_COMPONENTS
 from desktop.lib.paths import get_run_root, SAFE_CHARACTERS_URI_COMPONENTS
 from desktop.redaction import global_redaction_engine
 from desktop.redaction import global_redaction_engine
-from desktop.settings import DOCUMENT2_SEARCH_MAX_LENGTH
+from desktop.settings import DOCUMENT2_SEARCH_MAX_LENGTH, HUE_DESKTOP_VERSION
 
 
 if sys.version_info[0] > 2:
 if sys.version_info[0] > 2:
   import urllib.request, urllib.error
   import urllib.request, urllib.error
@@ -1798,7 +1797,7 @@ class ClusterConfig(object):
 
 
     if 'filebrowser' in self.apps and fsmanager.is_enabled_and_has_access('abfs', self.user):
     if 'filebrowser' in self.apps and fsmanager.is_enabled_and_has_access('abfs', self.user):
       from azure.abfs.__init__ import get_home_dir_for_ABFS
       from azure.abfs.__init__ import get_home_dir_for_ABFS
-      
+
       interpreters.append({
       interpreters.append({
         'type': 'abfs',
         'type': 'abfs',
         'displayName': _('ABFS'),
         'displayName': _('ABFS'),

+ 1 - 1
desktop/core/src/desktop/templates/login.mako

@@ -150,7 +150,7 @@ ${ commonheader(_("Welcome to Hue"), "login", user, request, "50px", True, True)
 
 
   % if CUSTOM.LOGIN_SPLASH_HTML.get():
   % if CUSTOM.LOGIN_SPLASH_HTML.get():
   <div class="alert alert-info" id="login-splash">
   <div class="alert alert-info" id="login-splash">
-    ${ conf.CUSTOM.LOGIN_SPLASH_HTML.get() | n,unicode }
+    ${ CUSTOM.LOGIN_SPLASH_HTML.get() | n,unicode }
   </div>
   </div>
   % endif
   % endif
 </div>
 </div>