You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ambari.apache.org by at...@apache.org on 2018/08/20 14:39:45 UTC

[ambari] branch trunk updated: AMBARI-24505 host component out of sync error message on version screen

This is an automated email from the ASF dual-hosted git repository.

atkach pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/ambari.git


The following commit(s) were added to refs/heads/trunk by this push:
     new 154b36f  AMBARI-24505 host component out of sync error message on version screen
154b36f is described below

commit 154b36fde0c996b3806610f0f3d8cfdfb121766a
Author: Andrii Tkach <at...@apache.org>
AuthorDate: Mon Aug 20 14:39:41 2018 +0300

    AMBARI-24505 host component out of sync error message on version screen
---
 ambari-web/app/styles/stack_versions.less          | 23 ++++++++++++++++++++++
 .../main/admin/stack_upgrade/versions_view.js      |  5 ++++-
 2 files changed, 27 insertions(+), 1 deletion(-)

diff --git a/ambari-web/app/styles/stack_versions.less b/ambari-web/app/styles/stack_versions.less
index b597ce5..8a88ac9 100644
--- a/ambari-web/app/styles/stack_versions.less
+++ b/ambari-web/app/styles/stack_versions.less
@@ -363,6 +363,29 @@
       }
     }
   }
+  .stack-error-row {
+    .image-container {
+      display: inline-block;
+      vertical-align: top;
+      margin-top: 5px;
+      margin-right: 15px;
+      i {
+        vertical-align: middle;
+        font-size: 22px;
+      }
+    }
+    .message-container {
+      display: inline-block;
+      max-width: 70%;
+    }
+    .stack-name {
+      margin-left: 15px;
+    }
+    .btn-container {
+      line-height: 36px;
+      float: right;
+    }
+  }
 }
 
 .version-box-popup {
diff --git a/ambari-web/app/views/main/admin/stack_upgrade/versions_view.js b/ambari-web/app/views/main/admin/stack_upgrade/versions_view.js
index 0d4ad83..d76a32a 100644
--- a/ambari-web/app/views/main/admin/stack_upgrade/versions_view.js
+++ b/ambari-web/app/views/main/admin/stack_upgrade/versions_view.js
@@ -144,7 +144,10 @@ App.MainAdminStackVersionsView = Em.View.extend({
    * @type {?Em.Object}
    */
   stackVersionError: function() {
-    const errorStack = this.get('repoVersions').filterProperty('status', 'OUT_OF_SYNC').findProperty('isStandard');
+    const errorStack = this.get('repoVersions')
+    .filterProperty('isVisible')
+    .filterProperty('status', 'OUT_OF_SYNC')
+    .findProperty('isStandard');
     if (errorStack) {
       return Em.Object.create({
         repoId: errorStack.get('id'),