ambari-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From alexantone...@apache.org
Subject [6/6] ambari git commit: AMBARI-11157. Add host kerberos client install does not have command text (alexantonenko)
Date Fri, 15 May 2015 09:53:57 GMT
AMBARI-11157. Add host kerberos client install does not have command text (alexantonenko)


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

Branch: refs/heads/trunk
Commit: 8dbdf1d003b0ab62cd73a928ebe765e047072094
Parents: 68d0294
Author: Alex Antonenko <hiveww@gmail.com>
Authored: Fri May 15 12:21:48 2015 +0300
Committer: Alex Antonenko <hiveww@gmail.com>
Committed: Fri May 15 12:53:46 2015 +0300

----------------------------------------------------------------------
 .../app/templates/wizard/step9/step9HostTasksLogPopup.hbs      | 6 ++++--
 ambari-web/app/utils/ajax/ajax.js                              | 2 +-
 ambari-web/app/views/wizard/step9/hostLogPopupBody_view.js     | 1 +
 .../test/views/wizard/step9/hostLogPopupBody_view_test.js      | 4 +++-
 4 files changed, 9 insertions(+), 4 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/ambari/blob/8dbdf1d0/ambari-web/app/templates/wizard/step9/step9HostTasksLogPopup.hbs
----------------------------------------------------------------------
diff --git a/ambari-web/app/templates/wizard/step9/step9HostTasksLogPopup.hbs b/ambari-web/app/templates/wizard/step9/step9HostTasksLogPopup.hbs
index daa082e..9886a3a 100644
--- a/ambari-web/app/templates/wizard/step9/step9HostTasksLogPopup.hbs
+++ b/ambari-web/app/templates/wizard/step9/step9HostTasksLogPopup.hbs
@@ -44,7 +44,7 @@
               <div class="operation-name-icon-wrap">
                 <i {{bindAttr class="taskInfo.status taskInfo.icon"}}></i>
                 <a href="#">
-                  {{taskInfo.role}} {{taskInfo.command}}
+                  {{taskInfo.commandDetail}}
                 </a>
               </div>
               <div class="show-details"><i class="icon-caret-right"></i></div>
@@ -68,7 +68,9 @@
             <a title="Click to Copy" {{action "textTrigger" taskInfo target="view"}} class="task-detail-copy"><i
class="icon-copy"></i> {{t common.copy}}</a>
             <a title="Open in New Window" {{action openTaskLogInDialog}} class="task-detail-open-dialog"><i
class="icon-external-link"></i> {{t common.open}}</a>
           </div>
-          <span class="task-detail-log-rolename">{{view.openedTask.role}} {{view.openedTask.command}}</span>
+          <span class="task-detail-log-rolename">
+            {{view.openedTask.commandDetail}}
+          </span>
         </div>
 
       </div>

http://git-wip-us.apache.org/repos/asf/ambari/blob/8dbdf1d0/ambari-web/app/utils/ajax/ajax.js
----------------------------------------------------------------------
diff --git a/ambari-web/app/utils/ajax/ajax.js b/ambari-web/app/utils/ajax/ajax.js
index 8998158..dab402d 100644
--- a/ambari-web/app/utils/ajax/ajax.js
+++ b/ambari-web/app/utils/ajax/ajax.js
@@ -1675,7 +1675,7 @@ var urls = {
     'mock': '/data/wizard/deploy/5_hosts/get_host_state.json'
   },
   'wizard.step9.load_log': {
-    'real': '/clusters/{cluster}/requests/{requestId}?fields=tasks/Tasks/command,tasks/Tasks/exit_code,tasks/Tasks/start_time,tasks/Tasks/end_time,tasks/Tasks/host_name,tasks/Tasks/id,tasks/Tasks/role,tasks/Tasks/status&minimal_response=true',
+    'real': '/clusters/{cluster}/requests/{requestId}?fields=tasks/Tasks/command,tasks/Tasks/command_detail,tasks/Tasks/exit_code,tasks/Tasks/start_time,tasks/Tasks/end_time,tasks/Tasks/host_name,tasks/Tasks/id,tasks/Tasks/role,tasks/Tasks/status&minimal_response=true',
     'mock': '/data/wizard/deploy/5_hosts/poll_{numPolls}.json',
     'format': function () {
       return {

http://git-wip-us.apache.org/repos/asf/ambari/blob/8dbdf1d0/ambari-web/app/views/wizard/step9/hostLogPopupBody_view.js
----------------------------------------------------------------------
diff --git a/ambari-web/app/views/wizard/step9/hostLogPopupBody_view.js b/ambari-web/app/views/wizard/step9/hostLogPopupBody_view.js
index c81230d..301c403 100644
--- a/ambari-web/app/views/wizard/step9/hostLogPopupBody_view.js
+++ b/ambari-web/app/views/wizard/step9/hostLogPopupBody_view.js
@@ -138,6 +138,7 @@ App.WizardStep9HostLogPopupBodyView = Em.View.extend({
         taskInfo.set('id', _task.Tasks.id);
         taskInfo.set('requestId', _task.Tasks.request_id);
         taskInfo.set('command', _task.Tasks.command.toLowerCase() === 'service_check' ? ''
: _task.Tasks.command.toLowerCase());
+        taskInfo.set('commandDetail', App.format.commandDetail(_task.Tasks.command_detail,
_task.Tasks.request_inputs));
         taskInfo.set('status', App.format.taskStatus(_task.Tasks.status));
         taskInfo.set('role', App.format.role(_task.Tasks.role));
         taskInfo.set('stderr', _task.Tasks.stderr);

http://git-wip-us.apache.org/repos/asf/ambari/blob/8dbdf1d0/ambari-web/test/views/wizard/step9/hostLogPopupBody_view_test.js
----------------------------------------------------------------------
diff --git a/ambari-web/test/views/wizard/step9/hostLogPopupBody_view_test.js b/ambari-web/test/views/wizard/step9/hostLogPopupBody_view_test.js
index 530727c..c039c0a 100644
--- a/ambari-web/test/views/wizard/step9/hostLogPopupBody_view_test.js
+++ b/ambari-web/test/views/wizard/step9/hostLogPopupBody_view_test.js
@@ -152,7 +152,8 @@ describe('App.WizardStep9HostLogPopupBodyView', function() {
         stderr: 'stderr',
         stdout: 'stdout',
         host_name: 'host1',
-        command: 'Cmd'
+        command: 'Cmd',
+        command_detail: 'TEST SERVICE/COMPONENT_DESCRIPTION'
       }
     };
 
@@ -164,6 +165,7 @@ describe('App.WizardStep9HostLogPopupBodyView', function() {
       expect(first.get('id')).to.equal(1);
       expect(first.get('requestId')).to.equal(2);
       expect(first.get('command')).to.equal('cmd');
+      expect(first.get('commandDetail')).to.equal(' Test Component Description');
       expect(first.get('role')).to.equal('Pig');
       expect(first.get('stderr')).to.equal('stderr');
       expect(first.get('stdout')).to.equal('stdout');


Mime
View raw message