You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ambari.apache.org by lp...@apache.org on 2017/09/05 09:41:29 UTC
[34/50] [abbrv] ambari git commit: AMBARI-21874. Change Patch/Maint
Bubbles To Type Columns (alexantonenko)
AMBARI-21874. Change Patch/Maint Bubbles To Type Columns (alexantonenko)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/18a16cbe
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/18a16cbe
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/18a16cbe
Branch: refs/heads/feature-branch-AMBARI-21307
Commit: 18a16cbe476a7cad89fdd2605e114d8919a175ea
Parents: a679281
Author: Alex Antonenko <aa...@hortonworks.com>
Authored: Mon Sep 4 13:55:48 2017 +0300
Committer: Alex Antonenko <aa...@hortonworks.com>
Committed: Mon Sep 4 13:55:48 2017 +0300
----------------------------------------------------------------------
.../controllers/stackVersions/StackVersionsListCtrl.js | 2 ++
.../resources/ui/admin-web/app/scripts/services/Stack.js | 4 ++++
.../ui/admin-web/app/views/stackVersions/list.html | 10 ++++++++--
3 files changed, 14 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ambari/blob/18a16cbe/ambari-admin/src/main/resources/ui/admin-web/app/scripts/controllers/stackVersions/StackVersionsListCtrl.js
----------------------------------------------------------------------
diff --git a/ambari-admin/src/main/resources/ui/admin-web/app/scripts/controllers/stackVersions/StackVersionsListCtrl.js b/ambari-admin/src/main/resources/ui/admin-web/app/scripts/controllers/stackVersions/StackVersionsListCtrl.js
index 03088d5..003d472 100644
--- a/ambari-admin/src/main/resources/ui/admin-web/app/scripts/controllers/stackVersions/StackVersionsListCtrl.js
+++ b/ambari-admin/src/main/resources/ui/admin-web/app/scripts/controllers/stackVersions/StackVersionsListCtrl.js
@@ -28,6 +28,7 @@ angular.module('ambariAdminConsole')
$scope.filter = {
name: '',
version: '',
+ type: '',
cluster: {
options: [],
current: null
@@ -189,6 +190,7 @@ angular.module('ambariAdminConsole')
$scope.$watch('filter', function (filter) {
$scope.isNotEmptyFilter = Boolean(filter.name
|| filter.version
+ || filter.type
|| (filter.cluster.current && filter.cluster.current.value)
|| (filter.stack.current && filter.stack.current.value));
}, true);
http://git-wip-us.apache.org/repos/asf/ambari/blob/18a16cbe/ambari-admin/src/main/resources/ui/admin-web/app/scripts/services/Stack.js
----------------------------------------------------------------------
diff --git a/ambari-admin/src/main/resources/ui/admin-web/app/scripts/services/Stack.js b/ambari-admin/src/main/resources/ui/admin-web/app/scripts/services/Stack.js
index 0ad6a09..8003dd1 100644
--- a/ambari-admin/src/main/resources/ui/admin-web/app/scripts/services/Stack.js
+++ b/ambari-admin/src/main/resources/ui/admin-web/app/scripts/services/Stack.js
@@ -178,6 +178,7 @@ angular.module('ambariAdminConsole')
allRepos: function (filter, pagination) {
var versionFilter = filter.version;
var nameFilter = filter.name;
+ var typeFilter = filter.type;
var stackFilter = filter.stack && filter.stack.current && filter.stack.current.value;
var url = '/stacks?fields=versions/repository_versions/RepositoryVersions';
if (versionFilter) {
@@ -186,6 +187,9 @@ angular.module('ambariAdminConsole')
if (nameFilter) {
url += '&versions/repository_versions/RepositoryVersions/display_name.matches(.*' + nameFilter + '.*)';
}
+ if (typeFilter){
+ url += '&versions/repository_versions/RepositoryVersions/type.matches(.*' + typeFilter.toUpperCase() + '.*)';
+ }
if (stackFilter) {
var stack = filter.stack.current.value.split('-'),
stackNameFilter = stack[0],
http://git-wip-us.apache.org/repos/asf/ambari/blob/18a16cbe/ambari-admin/src/main/resources/ui/admin-web/app/views/stackVersions/list.html
----------------------------------------------------------------------
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 bf19a62..3e788f8 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
@@ -46,6 +46,11 @@
<button type="button" class="close clearfilter" ng-show="filter.name" ng-click="filter.name=''; resetPagination()"><span aria-hidden="true">×</span><span class="sr-only">{{'common.controls.close' | translate}}</span></button>
</th>
<th class="col-medium text-search-container">
+ <label>{{'common.type' | translate}}</label>
+ <input type="text" class="form-control" ng-change="resetPagination()" ng-model="filter.type" placeholder="{{'common.any' | translate}}">
+ <button type="button" class="close clearfilter" ng-show="filter.type" ng-click="filter.type=''; resetPagination()"><span aria-hidden="true">×</span><span class="sr-only">{{'common.controls.close' | translate}}</span></button>
+ </th>
+ <th class="col-medium text-search-container">
<label>{{'common.version' | translate}}</label>
<input type="text" class="form-control" ng-change="resetPagination()" ng-model="filter.version" placeholder="{{'common.any' | translate}}">
<button type="button" class="close clearfilter" ng-show="filter.version" ng-click="filter.version=''; resetPagination()"><span aria-hidden="true">×</span><span class="sr-only">{{'common.controls.close' | translate}}</span></button>
@@ -70,10 +75,11 @@
<td class="col-medium">
<a href="#/stackVersions/{{repo.stack_name}}/{{repo.repository_version}}/edit">
{{repo.display_name}}
- <span ng-if="repo.isPatch" class="badge btn-warning">{{'versions.patch' | translate}}</span>
- <span ng-if="repo.isMaint" class="badge btn-warning">{{'versions.maint' | translate}}</span>
</a>
</td>
+ <td>
+ <span>{{repo.type}}</span>
+ </td>
<td class="col-medium">
<span>{{repo.repository_version}}</span>
</td>