Author: yusaku
Date: Fri May 17 00:30:00 2013
New Revision: 1483621
URL: http://svn.apache.org/r1483621
Log:
AMBARI-2153. Reassign Master Wizard: Background Operations popup should show
display names for services and components. (yusaku)
Modified:
incubator/ambari/trunk/CHANGES.txt
incubator/ambari/trunk/ambari-web/app/controllers/wizard/step14_controller.js
incubator/ambari/trunk/ambari-web/app/utils/ajax.js
Modified: incubator/ambari/trunk/CHANGES.txt
URL:
http://svn.apache.org/viewvc/incubator/ambari/trunk/CHANGES.txt?rev=1483621&r1=1483620&r2=1483621&view=diff
==============================================================================
--- incubator/ambari/trunk/CHANGES.txt (original)
+++ incubator/ambari/trunk/CHANGES.txt Fri May 17 00:30:00 2013
@@ -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)
Modified:
incubator/ambari/trunk/ambari-web/app/controllers/wizard/step14_controller.js
URL:
http://svn.apache.org/viewvc/incubator/ambari/trunk/ambari-web/app/controllers/wizard/step14_controller.js?rev=1483621&r1=1483620&r2=1483621&view=diff
==============================================================================
---
incubator/ambari/trunk/ambari-web/app/controllers/wizard/step14_controller.js
(original)
+++
incubator/ambari/trunk/ambari-web/app/controllers/wizard/step14_controller.js
Fri May 17 00:30:00 2013
@@ -213,7 +213,8 @@ App.WizardStep14Controller = Em.Controll
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.Controll
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.Controll
name: 'reassign.start_components',
sender: this,
data: {
- serviceName: serviceName
+ serviceName: serviceName,
+ displayName: App.Service.find().findProperty('serviceName',
serviceName).get('displayName')
},
beforeSend: 'onStartComponentsBeforeSend',
success: 'onStartComponentsSuccess',
Modified: incubator/ambari/trunk/ambari-web/app/utils/ajax.js
URL:
http://svn.apache.org/viewvc/incubator/ambari/trunk/ambari-web/app/utils/ajax.js?rev=1483621&r1=1483620&r2=1483621&view=diff
==============================================================================
--- incubator/ambari/trunk/ambari-web/app/utils/ajax.js (original)
+++ incubator/ambari/trunk/ambari-web/app/utils/ajax.js Fri May 17 00:30:00 2013
@@ -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: {
