You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ambari.apache.org by on...@apache.org on 2013/12/03 15:27:10 UTC
git commit: AMBARI-3955. "Default" config group should be
" Default". (Denis Buzhor via onechiporenko)
Updated Branches:
refs/heads/trunk 36c563665 -> 6bf9136f1
AMBARI-3955. "Default" config group should be "<Service-name> Default". (Denis Buzhor via onechiporenko)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/6bf9136f
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/6bf9136f
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/6bf9136f
Branch: refs/heads/trunk
Commit: 6bf9136f1298312e884fb6a16de938a6c0b63df4
Parents: 36c5636
Author: Oleg Nechiporenko <cv...@yahoo.com>
Authored: Tue Dec 3 16:25:40 2013 +0200
Committer: Oleg Nechiporenko <cv...@yahoo.com>
Committed: Tue Dec 3 16:27:04 2013 +0200
----------------------------------------------------------------------
ambari-web/app/controllers/main/service/info/configs.js | 1 +
.../main/service/manage_config_groups_controller.js | 3 ++-
ambari-web/app/controllers/wizard/step7_controller.js | 3 ++-
ambari-web/app/models/config_group.js | 6 ++++++
ambari-web/app/utils/config.js | 2 +-
5 files changed, 12 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ambari/blob/6bf9136f/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 beee93d..976b3d8 100644
--- a/ambari-web/app/controllers/main/service/info/configs.js
+++ b/ambari-web/app/controllers/main/service/info/configs.js
@@ -318,6 +318,7 @@ App.MainServiceInfoConfigsController = Em.Controller.extend({
hosts: defaultConfigGroupHosts,
parentConfigGroup: null,
service: this.get('content'),
+ serviceName: serviceName,
configSiteTags: []
});
if (!selectedConfigGroup) {
http://git-wip-us.apache.org/repos/asf/ambari/blob/6bf9136f/ambari-web/app/controllers/main/service/manage_config_groups_controller.js
----------------------------------------------------------------------
diff --git a/ambari-web/app/controllers/main/service/manage_config_groups_controller.js b/ambari-web/app/controllers/main/service/manage_config_groups_controller.js
index 7dab5a2..d6ee058 100644
--- a/ambari-web/app/controllers/main/service/manage_config_groups_controller.js
+++ b/ambari-web/app/controllers/main/service/manage_config_groups_controller.js
@@ -75,7 +75,8 @@ App.ManageConfigGroupsController = Em.Controller.extend({
isDefault: true,
parentConfigGroup: null,
service: this.get('content'),
- configSiteTags: []
+ configSiteTags: [],
+ serviceName: this.get('serviceName')
});
if (data && data.items) {
var groupToTypeToTagMap = {};
http://git-wip-us.apache.org/repos/asf/ambari/blob/6bf9136f/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 46058f3..d7e24ae 100644
--- a/ambari-web/app/controllers/wizard/step7_controller.js
+++ b/ambari-web/app/controllers/wizard/step7_controller.js
@@ -173,7 +173,8 @@ App.WizardStep7Controller = Em.Controller.extend({
hosts: Em.copy(hosts),
service: Em.Object.create({
id: service.serviceName
- })
+ }),
+ serviceName: service.serviceName
})
]);
} else {
http://git-wip-us.apache.org/repos/asf/ambari/blob/6bf9136f/ambari-web/app/models/config_group.js
----------------------------------------------------------------------
diff --git a/ambari-web/app/models/config_group.js b/ambari-web/app/models/config_group.js
index c383c76..e67aad7 100644
--- a/ambari-web/app/models/config_group.js
+++ b/ambari-web/app/models/config_group.js
@@ -38,6 +38,7 @@ App.ConfigGroup = Ember.Object.extend({
name: null,
description: null,
isDefault: null,
+ serviceName: null,
/**
* Parent configuration group for this group.
@@ -82,6 +83,11 @@ App.ConfigGroup = Ember.Object.extend({
*/
displayName: function () {
var name = this.get('name');
+ if (name && name == "Default") {
+ if (this.get('serviceName')) {
+ name = this.get('serviceName') + " Default";
+ }
+ }
if (name && name.length>App.config.CONFIG_GROUP_NAME_MAX_LENGTH) {
var middle = Math.floor(App.config.CONFIG_GROUP_NAME_MAX_LENGTH / 2);
name = name.substring(0, middle) + "..." + name.substring(name.length-middle);
http://git-wip-us.apache.org/repos/asf/ambari/blob/6bf9136f/ambari-web/app/utils/config.js
----------------------------------------------------------------------
diff --git a/ambari-web/app/utils/config.js b/ambari-web/app/utils/config.js
index 1a76560..f998974 100644
--- a/ambari-web/app/utils/config.js
+++ b/ambari-web/app/utils/config.js
@@ -1128,7 +1128,7 @@ App.config = Em.Object.create({
},
bodyClass: Ember.View.extend({
template: Em.Handlebars.compile('{{t installer.controls.slaveComponentGroups}}: ' +
- '{{view Em.Select contentBinding="view.parentView.configGroups" optionLabelPath="content.name" selectionBinding="view.parentView.selectedConfigGroup"}}')
+ '{{view Em.Select contentBinding="view.parentView.configGroups" optionLabelPath="content.displayName" selectionBinding="view.parentView.selectedConfigGroup"}}')
})
});
},