Updated Branches: refs/heads/trunk 06c840fa6 -> 20b3d2dad
AMBARI-2613. Host Checks: truncation on checked processes makes it difficult to know the actual processes in conflict. (Aleksandr Kovalenko via yusaku) Project: http://git-wip-us.apache.org/repos/asf/incubator-ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ambari/commit/20b3d2da Tree: http://git-wip-us.apache.org/repos/asf/incubator-ambari/tree/20b3d2da Diff: http://git-wip-us.apache.org/repos/asf/incubator-ambari/diff/20b3d2da Branch: refs/heads/trunk Commit: 20b3d2dade2b65fca89cea98f042a5e4468d9851 Parents: 06c840f Author: Yusaku Sako <[email protected]> Authored: Thu Jul 11 11:31:21 2013 -0700 Committer: Yusaku Sako <[email protected]> Committed: Thu Jul 11 11:31:21 2013 -0700 ---------------------------------------------------------------------- ambari-web/app/controllers/wizard/step3_controller.js | 8 ++++++-- .../app/templates/wizard/step3_host_warnings_popup.hbs | 2 +- 2 files changed, 7 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ambari/blob/20b3d2da/ambari-web/app/controllers/wizard/step3_controller.js ---------------------------------------------------------------------- diff --git a/ambari-web/app/controllers/wizard/step3_controller.js b/ambari-web/app/controllers/wizard/step3_controller.js index 1261624..9f4b68d 100644 --- a/ambari-web/app/controllers/wizard/step3_controller.js +++ b/ambari-web/app/controllers/wizard/step3_controller.js @@ -754,12 +754,15 @@ App.WizardStep3Controller = Em.Controller.extend({ warning.onSingleHost = false; } else { warning = { - name: (process.command.substr(0, 15) + '...'), + name: (process.command.substr(0, 35) + '...'), hosts: [_host.Hosts.host_name], category: 'processes', user: process.user, pid: process.pid, - command: process.command, + command: '<table><tr><td style="word-break: break-all;">' + + ((process.command.length < 500) ? process.command : process.command.substr(0, 230) + '...' + + '<p style="text-align: center">................</p>' + + '...' + process.command.substr(-230)) + '</td></tr></table>', onSingleHost: true } warnings.push(warning); @@ -907,6 +910,7 @@ App.WizardStep3Controller = Em.Controller.extend({ return '#' + cat.category }).join(',')).hide(); this.$("[rel='HostsListTooltip']").tooltip({html: true, placement: "right"}); + this.$('#process .warning-name').tooltip({html: true, placement: "top"}); }) }.observes('content'), warningsByHost: function () { http://git-wip-us.apache.org/repos/asf/incubator-ambari/blob/20b3d2da/ambari-web/app/templates/wizard/step3_host_warnings_popup.hbs ---------------------------------------------------------------------- diff --git a/ambari-web/app/templates/wizard/step3_host_warnings_popup.hbs b/ambari-web/app/templates/wizard/step3_host_warnings_popup.hbs index a871873..8ad5409 100644 --- a/ambari-web/app/templates/wizard/step3_host_warnings_popup.hbs +++ b/ambari-web/app/templates/wizard/step3_host_warnings_popup.hbs @@ -63,7 +63,7 @@ <tbody> {{#each warning in category.warnings}} <tr> - <td>{{warning.name}}</td> + <td class="warning-name" {{bindAttr data-original-title="warning.command"}} >{{warning.name}}</td> <td>{{category.action}} <a href="javascript:void(null);" rel='HostsListTooltip' {{bindAttr data-original-title="warning.hostsList"}} {{action showHostsPopup warning.hosts}}> {{warning.hosts.length}}
