ambari-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From akovale...@apache.org
Subject ambari git commit: AMBARI-18164. Enable Interactive Query should not be available in Add Service Wizard (akovalenko)
Date Tue, 16 Aug 2016 16:59:38 GMT
Repository: ambari
Updated Branches:
  refs/heads/branch-2.4 22e1e24b6 -> 4aa04a2c9


AMBARI-18164. Enable Interactive Query should not be available in Add Service Wizard (akovalenko)


Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/4aa04a2c
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/4aa04a2c
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/4aa04a2c

Branch: refs/heads/branch-2.4
Commit: 4aa04a2c9e4208eb6afa71df9a1af7d3eb1930e8
Parents: 22e1e24
Author: Aleksandr Kovalenko <akovalenko@hortonworks.com>
Authored: Tue Aug 16 19:40:31 2016 +0300
Committer: Aleksandr Kovalenko <akovalenko@hortonworks.com>
Committed: Tue Aug 16 19:40:31 2016 +0300

----------------------------------------------------------------------
 ambari-web/app/controllers/wizard/step7_controller.js        | 8 +++++---
 .../app/models/configs/objects/service_config_property.js    | 1 +
 2 files changed, 6 insertions(+), 3 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/ambari/blob/4aa04a2c/ambari-web/app/controllers/wizard/step7_controller.js
----------------------------------------------------------------------
diff --git a/ambari-web/app/controllers/wizard/step7_controller.js b/ambari-web/app/controllers/wizard/step7_controller.js
index 30fd749..a35ea00 100644
--- a/ambari-web/app/controllers/wizard/step7_controller.js
+++ b/ambari-web/app/controllers/wizard/step7_controller.js
@@ -562,9 +562,11 @@ App.WizardStep7Controller = Em.Controller.extend(App.ServerValidatorMixin,
App.E
           var notEditableText = " " + Em.I18n.t('installer.step7.addWizard.notEditable');
           serviceConfig.set('description', serviceConfig.get('description') + notEditableText);
           serviceConfig.set('isReconfigurable', false);
-          config.isReconfigurable = false;
           serviceConfig.set('isEditable', false);
+          serviceConfig.set('disabledAsComponentAction', true);
+          config.isReconfigurable = false;
           config.isEditable = false;
+          config.disabledAsComponentActio = true;
         }
       }
     }, this);
@@ -1178,9 +1180,9 @@ App.WizardStep7Controller = Em.Controller.extend(App.ServerValidatorMixin,
App.E
       var isEditable = config.get('isEditable'),
         isServiceInstalled = this.get('installedServiceNames').contains(this.get('selectedService.serviceName'));
       if (isServiceInstalled) {
-        isEditable = config.get('isReconfigurable') && selectedGroup.get('isDefault');
+        isEditable = config.get('isReconfigurable') && selectedGroup.get('isDefault')
&& !config.get('disabledAsComponentAction');
       } else {
-        isEditable = selectedGroup.get('isDefault');
+        isEditable = selectedGroup.get('isDefault') && !config.get('disabledAsComponentAction');
       }
       if (config.get('group')) {
         isEditable = config.get('group.name') === this.get('selectedConfigGroup.name');

http://git-wip-us.apache.org/repos/asf/ambari/blob/4aa04a2c/ambari-web/app/models/configs/objects/service_config_property.js
----------------------------------------------------------------------
diff --git a/ambari-web/app/models/configs/objects/service_config_property.js b/ambari-web/app/models/configs/objects/service_config_property.js
index 03052e4..2757804 100644
--- a/ambari-web/app/models/configs/objects/service_config_property.js
+++ b/ambari-web/app/models/configs/objects/service_config_property.js
@@ -121,6 +121,7 @@ App.ServiceConfigProperty = Em.Object.extend({
   isRequired: true, // by default a config property is required
   isReconfigurable: true, // by default a config property is reconfigurable
   isEditable: true, // by default a config property is editable
+  disabledAsComponentAction: false, // is true for component action configs
   isNotEditable: Em.computed.not('isEditable'),
   hideFinalIcon: Em.computed.and('!isFinal', 'isNotEditable'),
   isVisible: true,


Mime
View raw message