Browse Source

AMBARI-2613. Host Checks: truncation on checked processes makes it difficult to know the actual processes in conflict. (Aleksandr Kovalenko via yusaku)

Yusaku Sako 12 years ago
parent
commit
20b3d2dade

+ 6 - 2
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 () {

+ 1 - 1
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}}