瀏覽代碼

AMBARI-1953. On Add Hosts, the request context for the start phase shows up as "Request Name Not Specified". (yusaku)

git-svn-id: https://svn.apache.org/repos/asf/incubator/ambari/trunk@1469162 13f79535-47bb-0310-9956-ffa450edef68
Yusaku Sako 12 年之前
父節點
當前提交
482979b0f9

+ 3 - 0
CHANGES.txt

@@ -752,6 +752,9 @@ Trunk (unreleased changes):
 
  BUG FIXES
 
+ AMBARI-1953. On Add Hosts, the request context for the start phase shows up
+ as "Request Name Not Specified". (yusaku)
+
  AMBARI-1966. Client install tasks are shown twice in progress popup during
  start phase of install wizard (update API call to include
  params/reconfigure_client). (yusaku)

+ 1 - 1
ambari-web/app/controllers/main/host/details.js

@@ -237,7 +237,7 @@ App.MainHostDetailsController = Em.Controller.extend({
 
           self.sendCommandToServer('/host_components?HostRoles/host_name=' + self.get('content.hostName') + '\&HostRoles/component_name=' + componentName + '\&HostRoles/state=INIT',{
               RequestInfo : {
-                "context" : Em.I18n.t('requestInfo.installingHostComponent')+ " " + componentName
+                "context" : Em.I18n.t('requestInfo.installNewHostComponent')+ " " + componentName
               },
               Body:{
                 HostRoles:{

+ 2 - 2
ambari-web/app/controllers/wizard/step9_controller.js

@@ -332,10 +332,10 @@ App.WizardStep9Controller = Em.Controller.extend({
    * run start/check services after installation phase
    */
   launchStartServices: function () {
-    var data = '{"RequestInfo": {"context": "'+Em.I18n.t("requestInfo.serviceStartCheck")+'"}, "Body": {"ServiceInfo": {"state": "STARTED"}}}';
+    var data = '{"RequestInfo": {"context": "'+Em.I18n.t("requestInfo.startServices")+'"}, "Body": {"ServiceInfo": {"state": "STARTED"}}}';
     var name = 'wizard.step9.installer.launch_start_services';
     if (this.get('content.controllerName') === 'addHostController') {
-      data = '{"HostRoles": {"state": "STARTED"}}';
+      data = '{"RequestInfo": {"context": "'+Em.I18n.t("requestInfo.startHostComponents")+'"}, "Body": {"HostRoles": {"state": "STARTED"}}}';
       name = 'wizard.step9.add_host.launch_start_services';
     }
     if (App.testMode) {

+ 9 - 9
ambari-web/app/messages.js

@@ -128,19 +128,19 @@ Em.I18n.translations = {
   'common.abort': 'Abort',
   'common.misc': 'Misc',
 
-  'requestInfo.installComponents':'Installing Host Components',
-  'requestInfo.installServices':'Installing Services',
+  'requestInfo.installComponents':'Install Components',
+  'requestInfo.installServices':'Install Services',
+  'requestInfo.startServices':'Start Services',
   'requestInfo.stopAllServices':'Stop All Services',
   'requestInfo.startAllServices':'Start All Services',
-  'requestInfo.startHostComponent':'Start component',
-  'requestInfo.upgradeHostComponent':'Upgrade component',
-  'requestInfo.stopHostComponent':'Stop component',
-  'requestInfo.installHostComponent':'Install component',
-  'requestInfo.installingHostComponent':'Installing new component',
+  'requestInfo.startHostComponent':'Start Component',
+  'requestInfo.startHostComponents':'Start Components',
+  'requestInfo.upgradeHostComponent':'Upgrade Component',
+  'requestInfo.stopHostComponent':'Stop Component',
+  'requestInfo.installHostComponent':'Install Component',
+  'requestInfo.installNewHostComponent':'Install New Component',
   'requestInfo.stopService':'Stop Service',
   'requestInfo.startService':'Start Service',
-  'requestInfo.serviceStartCheck':'Check Started Services',
-
 
   'hostPopup.noServicesToShow':'No services to show',
   'hostPopup.noHostsToShow':'No hosts to show',