ambari-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From alexantone...@apache.org
Subject git commit: AMBARI-3955. "Default" config group should be "<Service-name> Default" (Denis Buzhor via alexantonenko)
Date Fri, 06 Dec 2013 12:08:11 GMT
Updated Branches:
  refs/heads/trunk 7199a0b41 -> da16636dd


AMBARI-3955. "Default" config group should be "<Service-name> Default" (Denis Buzhor
via alexantonenko)


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

Branch: refs/heads/trunk
Commit: da16636dda11384afba47f72dafdbd8398a05ce8
Parents: 7199a0b
Author: Alex Antonenko <hiveww@gmail.com>
Authored: Fri Dec 6 14:08:09 2013 +0200
Committer: Alex Antonenko <hiveww@gmail.com>
Committed: Fri Dec 6 14:08:09 2013 +0200

----------------------------------------------------------------------
 ambari-web/app/models/config_group.js | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/ambari/blob/da16636d/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 e67aad7..d99d143 100644
--- a/ambari-web/app/models/config_group.js
+++ b/ambari-web/app/models/config_group.js
@@ -85,7 +85,10 @@ App.ConfigGroup = Ember.Object.extend({
     var name = this.get('name');
     if (name && name == "Default") {
       if (this.get('serviceName')) {
-        name = this.get('serviceName') + " Default";
+        name = App.Service.DisplayNames[this.get('serviceName').toUpperCase()] + " Default";
+      }
+      if (this.get('service')) {
+        name = App.Service.DisplayNames[this.get('service.id')] + " Default";
       }
     }
     if (name && name.length>App.config.CONFIG_GROUP_NAME_MAX_LENGTH) {


Mime
View raw message