You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ambari.apache.org by at...@apache.org on 2015/12/18 12:16:16 UTC
ambari git commit: AMBARI-14417 Service Configs page doesn't load.
(atkach)
Repository: ambari
Updated Branches:
refs/heads/trunk 5ce4f5448 -> c575b6ea9
AMBARI-14417 Service Configs page doesn't load. (atkach)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/c575b6ea
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/c575b6ea
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/c575b6ea
Branch: refs/heads/trunk
Commit: c575b6ea97387676103be7ee06d2c0c5f334b1b8
Parents: 5ce4f54
Author: Andrii Tkach <at...@hortonworks.com>
Authored: Fri Dec 18 12:13:38 2015 +0200
Committer: Andrii Tkach <at...@hortonworks.com>
Committed: Fri Dec 18 13:15:03 2015 +0200
----------------------------------------------------------------------
ambari-web/app/mappers/configs/config_groups_mapper.js | 2 +-
ambari-web/app/models/configs/config_group.js | 4 ++--
ambari-web/test/models/configs/config_group_test.js | 2 +-
3 files changed, 4 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ambari/blob/c575b6ea/ambari-web/app/mappers/configs/config_groups_mapper.js
----------------------------------------------------------------------
diff --git a/ambari-web/app/mappers/configs/config_groups_mapper.js b/ambari-web/app/mappers/configs/config_groups_mapper.js
index 7630d0e..f5df389 100644
--- a/ambari-web/app/mappers/configs/config_groups_mapper.js
+++ b/ambari-web/app/mappers/configs/config_groups_mapper.js
@@ -126,7 +126,7 @@ App.configGroupsMapper = App.QuickDataMapper.create({
generateDefaultGroup: function (serviceName, hostNames, childConfigGroups) {
return {
id: App.ServiceConfigGroup.getParentConfigGroupId(serviceName),
- config_group_id: '-1',
+ config_group_id: -1,
name: 'Default',
service_name: serviceName,
description: 'Default cluster level ' + App.format.role(serviceName) + ' configuration',
http://git-wip-us.apache.org/repos/asf/ambari/blob/c575b6ea/ambari-web/app/models/configs/config_group.js
----------------------------------------------------------------------
diff --git a/ambari-web/app/models/configs/config_group.js b/ambari-web/app/models/configs/config_group.js
index f2af891..20e99b5 100644
--- a/ambari-web/app/models/configs/config_group.js
+++ b/ambari-web/app/models/configs/config_group.js
@@ -28,7 +28,7 @@ App.ServiceConfigGroup = DS.Model.extend({
/**
* original id for config group that is get from server
- * for default groups "-1"
+ * for default groups -1
* @property {number}
*/
configGroupId: DS.attr('number'),
@@ -63,7 +63,7 @@ App.ServiceConfigGroup = DS.Model.extend({
* defines if group is default
* @type {boolean}
*/
- isDefault: Em.computed.equal('configGroupId', '-1'),
+ isDefault: Em.computed.equal('configGroupId', -1),
/**
* list of group names that shows which config
http://git-wip-us.apache.org/repos/asf/ambari/blob/c575b6ea/ambari-web/test/models/configs/config_group_test.js
----------------------------------------------------------------------
diff --git a/ambari-web/test/models/configs/config_group_test.js b/ambari-web/test/models/configs/config_group_test.js
index 9ba8469..a0c42fd 100644
--- a/ambari-web/test/models/configs/config_group_test.js
+++ b/ambari-web/test/models/configs/config_group_test.js
@@ -33,7 +33,7 @@ describe('App.ServiceConfigGroup', function () {
model = getModel();
});
- App.TestAliases.testAsComputedEqual(getModel(), 'isDefault', 'configGroupId', '-1');
+ App.TestAliases.testAsComputedEqual(getModel(), 'isDefault', 'configGroupId', -1);
describe("#displayName", function() {