You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ambari.apache.org by ab...@apache.org on 2015/12/03 10:50:05 UTC
[1/2] ambari git commit: AMBARI-14170 Config comparison page:
Properties with empty value in the previous version being compared are shown
as undefined. (ababiichuk)
Repository: ambari
Updated Branches:
refs/heads/trunk 04f420438 -> 53ab860fc
AMBARI-14170 Config comparison page: Properties with empty value in the previous version being compared are shown as undefined. (ababiichuk)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/da1c64c1
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/da1c64c1
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/da1c64c1
Branch: refs/heads/trunk
Commit: da1c64c1f57d100151eeb472b43a0bc77c6bb8fb
Parents: 04f4204
Author: aBabiichuk <ab...@cybervisiontech.com>
Authored: Thu Dec 3 09:48:27 2015 +0200
Committer: aBabiichuk <ab...@cybervisiontech.com>
Committed: Thu Dec 3 11:48:40 2015 +0200
----------------------------------------------------------------------
ambari-web/app/mixins/common/configs/configs_comparator.js | 2 +-
ambari-web/app/utils/config.js | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ambari/blob/da1c64c1/ambari-web/app/mixins/common/configs/configs_comparator.js
----------------------------------------------------------------------
diff --git a/ambari-web/app/mixins/common/configs/configs_comparator.js b/ambari-web/app/mixins/common/configs/configs_comparator.js
index 0e33680..75bb44a 100644
--- a/ambari-web/app/mixins/common/configs/configs_comparator.js
+++ b/ambari-web/app/mixins/common/configs/configs_comparator.js
@@ -314,7 +314,7 @@ App.ConfigsComparator = Em.Mixin.create({
isOverridable: false,
isReconfigurable: false,
isRequired: false,
- isRequiredByAgent: false,
+ isRequiredByAgent: true,
isSecureConfig: false,
isUserProperty: true,
isVisible: true,
http://git-wip-us.apache.org/repos/asf/ambari/blob/da1c64c1/ambari-web/app/utils/config.js
----------------------------------------------------------------------
diff --git a/ambari-web/app/utils/config.js b/ambari-web/app/utils/config.js
index f1240bc..9a14c78 100644
--- a/ambari-web/app/utils/config.js
+++ b/ambari-web/app/utils/config.js
@@ -436,7 +436,7 @@ App.config = Em.Object.create({
* @returns {*}
*/
formatPropertyValue: function(serviceConfigProperty, originalValue) {
- var value = originalValue || Em.get(serviceConfigProperty, 'value'),
+ var value = Em.isNone(originalValue) ? Em.get(serviceConfigProperty, 'value') : originalValue,
displayType = Em.get(serviceConfigProperty, 'displayType') || Em.get(serviceConfigProperty, 'valueAttributes.type'),
category = Em.get(serviceConfigProperty, 'category');
switch (displayType) {
[2/2] ambari git commit: AMBARI-14172 spark_thrift_cmd_opts fail to
work. (ababiichuk)
Posted by ab...@apache.org.
AMBARI-14172 spark_thrift_cmd_opts fail to work. (ababiichuk)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/53ab860f
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/53ab860f
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/53ab860f
Branch: refs/heads/trunk
Commit: 53ab860fcb87814d283ec7cb4fb662f7b46ef873
Parents: da1c64c
Author: aBabiichuk <ab...@cybervisiontech.com>
Authored: Thu Dec 3 10:45:47 2015 +0200
Committer: aBabiichuk <ab...@cybervisiontech.com>
Committed: Thu Dec 3 11:48:41 2015 +0200
----------------------------------------------------------------------
ambari-web/app/controllers/main/service/info/configs.js | 8 ++------
ambari-web/app/models/stack_service.js | 6 ++++++
2 files changed, 8 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ambari/blob/53ab860f/ambari-web/app/controllers/main/service/info/configs.js
----------------------------------------------------------------------
diff --git a/ambari-web/app/controllers/main/service/info/configs.js b/ambari-web/app/controllers/main/service/info/configs.js
index 355ebd4..8b97b0d 100644
--- a/ambari-web/app/controllers/main/service/info/configs.js
+++ b/ambari-web/app/controllers/main/service/info/configs.js
@@ -486,13 +486,9 @@ App.MainServiceInfoConfigsController = Em.Controller.extend(App.ConfigsLoader, A
onLoadOverrides: function (allConfigs) {
this.get('servicesToLoad').forEach(function(serviceName) {
var configGroups = serviceName == this.get('content.serviceName') ? this.get('configGroups') : this.get('dependentConfigGroups').filterProperty('serviceName', serviceName);
- var serviceNames = [ serviceName ];
- if(serviceName === 'OOZIE') {
- // For Oozie, also add ELService properties which are marked as FALCON properties.
- serviceNames.push('FALCON');
- }
+ var configTypes = App.StackService.find(serviceName).get('configTypeList');
var configsByService = this.get('allConfigs').filter(function (c) {
- return serviceNames.contains(c.get('serviceName'));
+ return configTypes.contains(App.config.getConfigTagFromFileName(c.get('filename')));
});
var serviceConfig = App.config.createServiceConfig(serviceName, configGroups, configsByService, configsByService.length);
this.addHostNamesToConfigs(serviceConfig);
http://git-wip-us.apache.org/repos/asf/ambari/blob/53ab860f/ambari-web/app/models/stack_service.js
----------------------------------------------------------------------
diff --git a/ambari-web/app/models/stack_service.js b/ambari-web/app/models/stack_service.js
index fb5ab16..5ab9e74 100644
--- a/ambari-web/app/models/stack_service.js
+++ b/ambari-web/app/models/stack_service.js
@@ -45,6 +45,12 @@ App.StackService = DS.Model.extend({
requiredServices: DS.attr('array'),
/**
+ * @type {String[]}
+ */
+ configTypeList: function() {
+ return Object.keys(this.get('configTypes') || {});
+ }.property('configTypes'),
+ /**
* contains array of serviceNames that have configs that
* depends on configs from current service
* @type {String[]}