ambari-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From alexantone...@apache.org
Subject ambari git commit: AMBARI-21826. Install button showing wrong list of services to install (alexantonenko)
Date Mon, 28 Aug 2017 14:14:06 GMT
Repository: ambari
Updated Branches:
  refs/heads/branch-2.6 24639dd02 -> 80aa50b66


AMBARI-21826. Install button showing wrong list of services to install (alexantonenko)


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

Branch: refs/heads/branch-2.6
Commit: 80aa50b6624ed1cd6a9c5e8b1c4cc41bb4b01b0d
Parents: 24639dd
Author: Alex Antonenko <aantonenko@hortonworks.com>
Authored: Mon Aug 28 17:13:41 2017 +0300
Committer: Alex Antonenko <aantonenko@hortonworks.com>
Committed: Mon Aug 28 17:13:41 2017 +0300

----------------------------------------------------------------------
 .../app/controllers/main/admin/stack_and_upgrade_controller.js   | 2 +-
 ambari-web/app/styles/stack_versions.less                        | 4 +++-
 .../main/admin/stack_upgrade/upgrade_version_column.hbs          | 1 +
 3 files changed, 5 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/ambari/blob/80aa50b6/ambari-web/app/controllers/main/admin/stack_and_upgrade_controller.js
----------------------------------------------------------------------
diff --git a/ambari-web/app/controllers/main/admin/stack_and_upgrade_controller.js b/ambari-web/app/controllers/main/admin/stack_and_upgrade_controller.js
index c00ddf5..8792b31 100644
--- a/ambari-web/app/controllers/main/admin/stack_and_upgrade_controller.js
+++ b/ambari-web/app/controllers/main/admin/stack_and_upgrade_controller.js
@@ -1453,7 +1453,7 @@ App.MainAdminStackAndUpgradeController = Em.Controller.extend(App.LocalStorage,
       ? Em.I18n.t('admin.stackVersions.version.install.patch.confirm')
       : Em.I18n.t('admin.stackVersions.version.install.confirm');
     var availableServices = repo.get('stackServices').filter(function(service) {
-      return App.Service.find(service.get('name')).get('isLoaded') && service.get('isAvailable');
+      return App.Service.find(service.get('name')).get('isLoaded') && service.get('isAvailable')
&& service.get('isUpgradable');
     }, this);
     return App.ModalPopup.show({
       header: Em.I18n.t('popup.confirmation.commonHeader'),

http://git-wip-us.apache.org/repos/asf/ambari/blob/80aa50b6/ambari-web/app/styles/stack_versions.less
----------------------------------------------------------------------
diff --git a/ambari-web/app/styles/stack_versions.less b/ambari-web/app/styles/stack_versions.less
index 631186a..e1db616 100644
--- a/ambari-web/app/styles/stack_versions.less
+++ b/ambari-web/app/styles/stack_versions.less
@@ -368,7 +368,9 @@
       line-height: 20px;
       padding-top: 0;
       padding-bottom: 25px;
-      overflow: hidden;
+      &.overflow{
+        overflow: hidden;
+      }
     }
     .services-section {
       width: 100%;

http://git-wip-us.apache.org/repos/asf/ambari/blob/80aa50b6/ambari-web/app/templates/main/admin/stack_upgrade/upgrade_version_column.hbs
----------------------------------------------------------------------
diff --git a/ambari-web/app/templates/main/admin/stack_upgrade/upgrade_version_column.hbs
b/ambari-web/app/templates/main/admin/stack_upgrade/upgrade_version_column.hbs
index 581ff1e..1909f82 100644
--- a/ambari-web/app/templates/main/admin/stack_upgrade/upgrade_version_column.hbs
+++ b/ambari-web/app/templates/main/admin/stack_upgrade/upgrade_version_column.hbs
@@ -23,6 +23,7 @@
 <div {{bindAttr class="view.stateElement.isInstalling:installing
                        view.stateElement.isButton:attach-top
                        view.stateElement.isCurrent:attach-top
+                       view.stateElement.isLabel:overflow
                        view.stateElement.isButtonGroup:attach-top :align-center :state :repo-version-tooltip"}}>
     {{#if view.stateElement.isButton}}
       <button class="btn btn-primary"


Mime
View raw message