[ambari] branch trunk updated: AMBARI-23039 'Current' Tag not shown in the Versions page for the currently installed version

[atkach]

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 9d646a4  AMBARI-23039 'Current' Tag not shown in the Versions page for 
the currently installed version
9d646a4 is described below

commit 9d646a4d9252d79e9cdeda21a208eaaafabf1707
Author: Andrii Tkach <atk...@apache.org>
AuthorDate: Wed Feb 21 14:02:19 2018 +0200

    AMBARI-23039 'Current' Tag not shown in the Versions page for the currently 
installed version
---
 .../src/main/resources/ui/admin-web/app/styles/main.css |  4 ++--
 .../ui/admin-web/app/views/stackVersions/list.html      |  4 ++--
 .../admin/stack_upgrade/upgrade_version_column_view.js  | 17 ++++++++++-------
 3 files changed, 14 insertions(+), 11 deletions(-)

diff --git a/ambari-admin/src/main/resources/ui/admin-web/app/styles/main.css 
b/ambari-admin/src/main/resources/ui/admin-web/app/styles/main.css
index b93ea7f..66ca210 100644
--- a/ambari-admin/src/main/resources/ui/admin-web/app/styles/main.css
+++ b/ambari-admin/src/main/resources/ui/admin-web/app/styles/main.css
@@ -758,11 +758,11 @@ accordion .panel-group .panel{
   padding-right: 15px;
 }
 
-.status-current {
+.status-CURRENT {
   background-color: green;
 }
 
-.status-installed {
+.status-INSTALLED {
   background-color: #999;
 }
 
diff --git 
a/ambari-admin/src/main/resources/ui/admin-web/app/views/stackVersions/list.html
 
b/ambari-admin/src/main/resources/ui/admin-web/app/views/stackVersions/list.html
index 697b3b2..41af2eb 100644
--- 
a/ambari-admin/src/main/resources/ui/admin-web/app/views/stackVersions/list.html
+++ 
b/ambari-admin/src/main/resources/ui/admin-web/app/views/stackVersions/list.html
@@ -82,10 +82,10 @@
         </span>
       </td>
       <td class="verison-label-row">
-        <div ng-show="repo.status == 'current'">
+        <div ng-show="repo.status == 'CURRENT'">
           <span class="label {{'status-' + repo.status}}">{{'versions.current' 
| translate}}:&nbsp;{{repo.currentHosts}}/{{repo.totalHosts}}</span>
         </div>
-        <div ng-show="repo.status == 'installed'">
+        <div ng-show="repo.status == 'INSTALLED'">
           <span class="label {{'status-' + 
repo.status}}">{{'versions.installed' | 
translate}}:&nbsp;{{repo.installedHosts}}/{{repo.totalHosts}}</span>
         </div>
         <div ng-show="!repo.cluster">
diff --git 
a/ambari-web/app/views/main/admin/stack_upgrade/upgrade_version_column_view.js 
b/ambari-web/app/views/main/admin/stack_upgrade/upgrade_version_column_view.js
index 3a406d8..cb276ae 100644
--- 
a/ambari-web/app/views/main/admin/stack_upgrade/upgrade_version_column_view.js
+++ 
b/ambari-web/app/views/main/admin/stack_upgrade/upgrade_version_column_view.js
@@ -17,7 +17,6 @@
  */
 
 var App = require('app');
-var stringUtils = require('utils/string_utils');
 
 App.UpgradeVersionColumnView = App.UpgradeVersionBoxView.extend({
   templateName: 
require('templates/main/admin/stack_upgrade/upgrade_version_column'),
@@ -32,17 +31,21 @@ App.UpgradeVersionColumnView = 
App.UpgradeVersionBoxView.extend({
         title: Em.I18n.t('admin.stackVersions.version.noCompatible.tooltip')
       });
     }
-    //set the width, height of each version colum dynamically
-    var widthFactor = App.RepositoryVersion.find().get('length') > 3 ? 0.18: 
0.31;
+    this.adjustColumnWidth();
+  },
+
+  adjustColumnWidth: function() {
+    //set the width, height of each version column dynamically
+    var reposCount = 
App.RepositoryVersion.find().filterProperty('isVisible').get('length');
+    var widthFactor = reposCount > 3 ? 0.18: 0.31;
     $('.version-column').width($('.versions-slides').width() * widthFactor);
     var height = App.Service.find().get('length') > 10 ? 
((App.Service.find().get('length') - 10) * 40 + 500) : 500;
     $('.version-column').height(height);
 
     // set the lines width of the table, line up the labels
-    var account = App.RepositoryVersion.find().get('length');
-    $('.border-extended-table').width(account * 100 + 100 + "%");
-    $('.border-extended-table').css("max-width", account * 100 + 100 + "%");
-  },
+    $('.border-extended-table').width(reposCount * 100 + 100 + "%");
+    $('.border-extended-table').css("max-width", reposCount * 100 + 100 + "%");
+  }.observes('parentView.repoVersions.@each.isVisible'),
 
   services: function() {
     var originalServices = this.get('content.stackServices');

-- 
To stop receiving notification emails like this one, please contact
atk...@apache.org.