AMBARI-2153. Reassign Master Wizard: Background Operations popup should show display names for services and components. (yusaku)

git-svn-id: https://svn.apache.org/repos/asf/incubator/ambari/trunk@1483621 13f79535-47bb-0310-9956-ffa450edef68

CHANGES.txt

@@ -862,6 +862,9 @@ Trunk (unreleased changes):
 
  BUG FIXES
 
+ AMBARI-2153. Reassign Master Wizard: Background Operations popup should show
+ display names for services and components. (yusaku)
+
  AMBARI-2152. Sometimes stale host / host component indicators are shown.
  (yusaku)
 

ambari-web/app/controllers/wizard/step14_controller.js

@@ -213,7 +213,8 @@ App.WizardStep14Controller = Em.Controller.extend({
         name: 'reassign.stop_service',
         sender: this,
         data: {
-          serviceName: serviceName
+          serviceName: serviceName,
+          displayName: App.Service.find().findProperty('serviceName', serviceName).get('displayName')
         },
         beforeSend: 'onStopServiceBeforeSend',
         success: 'onStopServiceSuccess',
@@ -660,7 +661,8 @@ App.WizardStep14Controller = Em.Controller.extend({
         sender: this,
         data: {
           hostName: hostName,
-          componentName: componentName
+          componentName: componentName,
+          displayName: App.format.role(componentName)
         },
         beforeSend: 'onInstallComponentBeforeSend',
         success: 'onInstallComponentSuccess',
@@ -701,7 +703,8 @@ App.WizardStep14Controller = Em.Controller.extend({
         name: 'reassign.start_components',
         sender: this,
         data: {
-          serviceName: serviceName
+          serviceName: serviceName,
+          displayName: App.Service.find().findProperty('serviceName', serviceName).get('displayName')
         },
         beforeSend: 'onStartComponentsBeforeSend',
         success: 'onStartComponentsSuccess',

ambari-web/app/utils/ajax.js

@@ -86,7 +86,7 @@ var urls = {
       return {
         data: JSON.stringify({
           RequestInfo: {
-            "context": "Stop service " + data.serviceName
+            "context": "Stop service " + data.displayName
           },
           Body: {
             ServiceInfo: {
@@ -137,7 +137,7 @@ var urls = {
       return {
         data: JSON.stringify({
           RequestInfo: {
-            "context": "Install " + data.componentName
+            "context": "Install " + data.displayName
           },
           Body: {
             "HostRoles": {
@@ -156,7 +156,7 @@ var urls = {
       return {
         data: JSON.stringify({
           RequestInfo: {
-            "context": "Start service " + data.serviceName
+            "context": "Start service " + data.displayName
           },
           Body: {
             ServiceInfo: {