Repository: ambari Updated Branches: refs/heads/trunk 0300a6aee -> af19b7d0f
AMBARI-15688. Ambari Admin: 'users/groups' message on Roles page is not correct (alexantonenko) Project: http://git-wip-us.apache.org/repos/asf/ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/af19b7d0 Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/af19b7d0 Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/af19b7d0 Branch: refs/heads/trunk Commit: af19b7d0f16f850eef1a8164ea9670402f33049d Parents: 891addc Author: Alex Antonenko <[email protected]> Authored: Mon Apr 4 19:47:06 2016 +0300 Committer: Alex Antonenko <[email protected]> Committed: Tue Apr 5 01:21:54 2016 +0300 ---------------------------------------------------------------------- .../app/scripts/controllers/clusters/UserAccessListCtrl.js | 5 +++-- .../ui/admin-web/app/views/clusters/userAccessList.html | 4 ++-- .../ui/admin-web/app/views/modals/RoleDetailsModal.html | 2 +- 3 files changed, 6 insertions(+), 5 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ambari/blob/af19b7d0/ambari-admin/src/main/resources/ui/admin-web/app/scripts/controllers/clusters/UserAccessListCtrl.js ---------------------------------------------------------------------- diff --git a/ambari-admin/src/main/resources/ui/admin-web/app/scripts/controllers/clusters/UserAccessListCtrl.js b/ambari-admin/src/main/resources/ui/admin-web/app/scripts/controllers/clusters/UserAccessListCtrl.js index 346e922..32f46c1 100644 --- a/ambari-admin/src/main/resources/ui/admin-web/app/scripts/controllers/clusters/UserAccessListCtrl.js +++ b/ambari-admin/src/main/resources/ui/admin-web/app/scripts/controllers/clusters/UserAccessListCtrl.js @@ -22,7 +22,8 @@ angular.module('ambariAdminConsole') function($scope, $location, Cluster, $modal, $rootScope, $routeParams, PermissionSaver, Alert, $translate) { var $t = $translate.instant; $scope.constants = { - usersGroups: $t('common.usersGroups').toLowerCase() + users: $t('common.users').toLowerCase(), + groups: $t('common.groups').toLowerCase() }; $scope.users = []; $scope.usersPerPage = 10; @@ -181,7 +182,7 @@ function($scope, $location, Cluster, $modal, $rootScope, $routeParams, Permissio $scope.currentPage = 1; $scope.loadUsers(); }; - $scope.currentRoleFilter = { label:$('common.all'), value: '' }; + $scope.currentRoleFilter = { label:$t('common.all'), value: '' }; $scope.typeFilterOptions = [ http://git-wip-us.apache.org/repos/asf/ambari/blob/af19b7d0/ambari-admin/src/main/resources/ui/admin-web/app/views/clusters/userAccessList.html ---------------------------------------------------------------------- diff --git a/ambari-admin/src/main/resources/ui/admin-web/app/views/clusters/userAccessList.html b/ambari-admin/src/main/resources/ui/admin-web/app/views/clusters/userAccessList.html index c14b8c3..e3bbcdc 100644 --- a/ambari-admin/src/main/resources/ui/admin-web/app/views/clusters/userAccessList.html +++ b/ambari-admin/src/main/resources/ui/admin-web/app/views/clusters/userAccessList.html @@ -85,11 +85,11 @@ </tbody> </table> <div class="alert alert-info col-sm-12" ng-show="!users.length"> - {{'common.alerts.nothingToDisplay' | translate: '{term: constants.usersGroups}'}} + {{'common.alerts.nothingToDisplay' | translate: '{term: (isUserActive ? constants.users : constants.groups)}'}} </div> <div class="col-sm-12 table-bar"> <div class="pull-left filtered-info"> - <span>{{'common.filterInfo' | translate: '{showed: tableInfo.showed, total: tableInfo.total, term: constants.usersGroups}'}}</span> + <span>{{'common.filterInfo' | translate: '{showed: tableInfo.showed, total: tableInfo.total, term: (isUserActive ? constants.users : constants.groups)}'}}</span> <span ng-show="isNotEmptyFilter">- <a href ng-click="clearFilters()">{{'common.controls.clearFilters' | translate}}</a></span> </div> <div class="pull-right left-margin"> http://git-wip-us.apache.org/repos/asf/ambari/blob/af19b7d0/ambari-admin/src/main/resources/ui/admin-web/app/views/modals/RoleDetailsModal.html ---------------------------------------------------------------------- diff --git a/ambari-admin/src/main/resources/ui/admin-web/app/views/modals/RoleDetailsModal.html b/ambari-admin/src/main/resources/ui/admin-web/app/views/modals/RoleDetailsModal.html index f750142..e2222a8 100644 --- a/ambari-admin/src/main/resources/ui/admin-web/app/views/modals/RoleDetailsModal.html +++ b/ambari-admin/src/main/resources/ui/admin-web/app/views/modals/RoleDetailsModal.html @@ -34,5 +34,5 @@ </table> </div> <div class="modal-footer text-center"> - <button class="btn btn-primary" ng-click="ok()">Close</button> + <button class="btn btn-primary" ng-click="ok()">{{'common.controls.close' | translate}}</button> </div>
