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

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) {

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 = {};

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 {

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);

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"}}')
       })
     });
   },