Sfoglia il codice sorgente

HUE-3972 [core] Do not update saved configuration if properties is an empty list

Jenny Kim 9 anni fa
parent
commit
c80abf0ca8

+ 10 - 7
desktop/core/src/desktop/configuration/api.py

@@ -206,18 +206,21 @@ def _update_default_and_group_configurations(configurations):
     for app, configs in configurations.items():
       if 'default' in configs:
         properties = configs['default']
-        _save_configuration(app, properties, is_default=True)
-        LOG.info('Saved default configuration for app: %s' % app)
+        if properties:
+          _save_configuration(app, properties, is_default=True)
+          LOG.info('Saved default configuration for app: %s' % app)
 
       if 'groups' in configs:
         for group_config in configs['groups']:
           group_ids = group_config.get('group_ids')
           properties = group_config.get('properties')
-          try:
-            groups = Group.objects.filter(id__in=group_ids)
-            _save_configuration(app, properties, is_default=False, groups=groups)
-          except Group.DoesNotExist, e:
-            raise PopupException(_('Could not find one or more groups with IDs: %s') % ', '.join(group_ids))
+
+          if properties:
+            try:
+              groups = Group.objects.filter(id__in=group_ids)
+              _save_configuration(app, properties, is_default=False, groups=groups)
+            except Group.DoesNotExist, e:
+              raise PopupException(_('Could not find one or more groups with IDs: %s') % ', '.join(group_ids))
 
   return _get_default_configurations()
 

+ 2 - 2
desktop/libs/notebook/src/notebook/connectors/hiveserver2.py

@@ -45,11 +45,11 @@ try:
   from beeswax.server.dbms import get_query_server_config, QueryServerException
   from beeswax.views import _parse_out_hadoop_jobs
 except ImportError, e:
-  LOG.exception('Hive and HiveServer2 interfaces are not enabled')
+  LOG.warn('Hive and HiveServer2 interfaces are not enabled')
 
 try:
   from impala.conf import CONFIG_WHITELIST as impala_settings
-  from impala import views   # Force checking if Impala is enabled
+  from impala import api   # Force checking if Impala is enabled
 except ImportError, e:
   LOG.warn("Impala app is not enabled")
   impala_settings = None