You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ambari.apache.org by al...@apache.org on 2016/03/28 21:35:28 UTC
ambari git commit: AMBARI-15548. Add OS button on Edit repository
version page shows extra space when no repositories have been selected for
removal (alexantonenko)
Repository: ambari
Updated Branches:
refs/heads/trunk c8d6c9f54 -> c4b16eefb
AMBARI-15548. Add OS button on Edit repository version page shows extra space when no repositories have been selected for removal
(alexantonenko)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/c4b16eef
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/c4b16eef
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/c4b16eef
Branch: refs/heads/trunk
Commit: c4b16eefb5685a02a2dc3626109ea28a4dc45314
Parents: c8d6c9f
Author: Alex Antonenko <hi...@gmail.com>
Authored: Mon Mar 28 22:35:06 2016 +0300
Committer: Alex Antonenko <hi...@gmail.com>
Committed: Mon Mar 28 22:35:23 2016 +0300
----------------------------------------------------------------------
.../controllers/stackVersions/StackVersionsEditCtrl.js | 13 +++++++++++++
.../app/views/stackVersions/stackVersionPage.html | 2 +-
2 files changed, 14 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ambari/blob/c4b16eef/ambari-admin/src/main/resources/ui/admin-web/app/scripts/controllers/stackVersions/StackVersionsEditCtrl.js
----------------------------------------------------------------------
diff --git a/ambari-admin/src/main/resources/ui/admin-web/app/scripts/controllers/stackVersions/StackVersionsEditCtrl.js b/ambari-admin/src/main/resources/ui/admin-web/app/scripts/controllers/stackVersions/StackVersionsEditCtrl.js
index ae61909..c209fcc 100644
--- a/ambari-admin/src/main/resources/ui/admin-web/app/scripts/controllers/stackVersions/StackVersionsEditCtrl.js
+++ b/ambari-admin/src/main/resources/ui/admin-web/app/scripts/controllers/stackVersions/StackVersionsEditCtrl.js
@@ -234,6 +234,19 @@ angular.module('ambariAdminConsole')
}
};
+ $scope.hasNotDeletedRepo = function () {
+ //check if any repository has been selected for deleting
+ //if yes, drop down should be displayed
+ var repoNotDeleted = true;
+ for(var i=0;i<$scope.osList.length;i++) {
+ if (!$scope.osList[i].selected) {
+ repoNotDeleted=false;
+ break;
+ }
+ }
+ return repoNotDeleted;
+ };
+
/**
* On click handler for adding a new repository
*/
http://git-wip-us.apache.org/repos/asf/ambari/blob/c4b16eef/ambari-admin/src/main/resources/ui/admin-web/app/views/stackVersions/stackVersionPage.html
----------------------------------------------------------------------
diff --git a/ambari-admin/src/main/resources/ui/admin-web/app/views/stackVersions/stackVersionPage.html b/ambari-admin/src/main/resources/ui/admin-web/app/views/stackVersions/stackVersionPage.html
index a7dcaa5..39fabf6 100644
--- a/ambari-admin/src/main/resources/ui/admin-web/app/views/stackVersions/stackVersionPage.html
+++ b/ambari-admin/src/main/resources/ui/admin-web/app/views/stackVersions/stackVersionPage.html
@@ -166,7 +166,7 @@
<div class="btn-group pull-right" dropdown>
<button class="btn dropdown-toggle">
<span class="glyphicon glyphicon-plus"></span> {{'common.add' | translate: '{term: constants.os}'}} <span class="caret"></span></button>
- <ul class="dropdown-menu">
+ <ul class="dropdown-menu" ng-class="{'hidden': hasNotDeletedRepo()}">
<li ng-repeat="os in osList"><a ng-if="os.selected==false" ng-click="addOS()">{{os.OperatingSystems.os_type}}</a></li>
</ul>
</div>