You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ambari.apache.org by nc...@apache.org on 2016/02/01 16:42:06 UTC
[29/39] ambari git commit: AMBARI-14844. Ambari Admin: incorrect
'users' text on the Roles page (akovalenko)
AMBARI-14844. Ambari Admin: incorrect 'users' text on the Roles page (akovalenko)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/1be4a2d3
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/1be4a2d3
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/1be4a2d3
Branch: refs/heads/branch-dev-patch-upgrade
Commit: 1be4a2d3bd4899270c1c52c33fbc4dd5fb701814
Parents: 5facf9a
Author: Aleksandr Kovalenko <ak...@hortonworks.com>
Authored: Fri Jan 29 18:33:46 2016 +0200
Committer: Aleksandr Kovalenko <ak...@hortonworks.com>
Committed: Sat Jan 30 03:06:17 2016 +0200
----------------------------------------------------------------------
.../app/scripts/controllers/clusters/UserAccessListCtrl.js | 2 +-
.../src/main/resources/ui/admin-web/app/scripts/i18n.config.js | 1 +
.../ui/admin-web/app/views/clusters/userAccessList.html | 4 ++--
3 files changed, 4 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ambari/blob/1be4a2d3/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 eed71d5..17dac40 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,7 @@ angular.module('ambariAdminConsole')
function($scope, $location, Cluster, $modal, $rootScope, $routeParams, PermissionSaver, Alert, $translate) {
var $t = $translate.instant;
$scope.constants = {
- users: $t('common.users').toLowerCase()
+ usersGroups: $t('common.usersGroups').toLowerCase()
};
$scope.users = [];
$scope.usersPerPage = 10;
http://git-wip-us.apache.org/repos/asf/ambari/blob/1be4a2d3/ambari-admin/src/main/resources/ui/admin-web/app/scripts/i18n.config.js
----------------------------------------------------------------------
diff --git a/ambari-admin/src/main/resources/ui/admin-web/app/scripts/i18n.config.js b/ambari-admin/src/main/resources/ui/admin-web/app/scripts/i18n.config.js
index b274965..c83d627 100644
--- a/ambari-admin/src/main/resources/ui/admin-web/app/scripts/i18n.config.js
+++ b/ambari-admin/src/main/resources/ui/admin-web/app/scripts/i18n.config.js
@@ -74,6 +74,7 @@ angular.module('ambariAdminConsole')
'jwt': 'JWT',
'warning': 'Warning',
'filterInfo': '{{showed}} of {{total}} {{term}} showing',
+ 'usersGroups': 'Users/Groups',
'clusterNameChangeConfirmation': {
'title': 'Confirm Cluster Name Change',
http://git-wip-us.apache.org/repos/asf/ambari/blob/1be4a2d3/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 0f3da0e..8c12a25 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
@@ -73,11 +73,11 @@
</tbody>
</table>
<div class="alert alert-info col-sm-12" ng-show="!users.length">
- {{'common.alerts.nothingToDisplay' | translate: '{term: constants.users}'}}
+ {{'common.alerts.nothingToDisplay' | translate: '{term: constants.usersGroups}'}}
</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.users}'}}</span>
+ <span>{{'common.filterInfo' | translate: '{showed: tableInfo.showed, total: tableInfo.total, term: constants.usersGroups}'}}</span>
<span ng-show="isNotEmptyFilter">- <a href ng-click="clearFilters()">{{'common.controls.clearFilters' | translate}}</a></span>
</div>
<div class="pull-right left-margin">