Repository: ambari Updated Branches: refs/heads/branch-2.4 4e2ab4538 -> e02110f16
AMBARI-16637. Inherit Cluster Roles: edits UI #1 (akovalenko) Project: http://git-wip-us.apache.org/repos/asf/ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/e02110f1 Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/e02110f1 Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/e02110f1 Branch: refs/heads/branch-2.4 Commit: e02110f1610ba23de4517f51a09c65d9ee8da0d6 Parents: 4e2ab45 Author: Aleksandr Kovalenko <[email protected]> Authored: Thu May 12 18:10:21 2016 +0300 Committer: Aleksandr Kovalenko <[email protected]> Committed: Thu May 12 23:56:41 2016 +0300 ---------------------------------------------------------------------- .../controllers/ambariViews/ViewsEditCtrl.js | 17 +++++++++++++++++ .../ui/admin-web/app/scripts/i18n.config.js | 18 +++++++++++------- .../resources/ui/admin-web/app/styles/main.css | 9 --------- .../ui/admin-web/app/views/ambariViews/edit.html | 13 ++++++++++--- 4 files changed, 38 insertions(+), 19 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ambari/blob/e02110f1/ambari-admin/src/main/resources/ui/admin-web/app/scripts/controllers/ambariViews/ViewsEditCtrl.js ---------------------------------------------------------------------- diff --git a/ambari-admin/src/main/resources/ui/admin-web/app/scripts/controllers/ambariViews/ViewsEditCtrl.js b/ambari-admin/src/main/resources/ui/admin-web/app/scripts/controllers/ambariViews/ViewsEditCtrl.js index b4a9656..2b1fb3b 100644 --- a/ambari-admin/src/main/resources/ui/admin-web/app/scripts/controllers/ambariViews/ViewsEditCtrl.js +++ b/ambari-admin/src/main/resources/ui/admin-web/app/scripts/controllers/ambariViews/ViewsEditCtrl.js @@ -461,4 +461,21 @@ angular.module('ambariAdminConsole') event.preventDefault(); } }); + + $scope.checkAllRoles = function () { + setAllViewRoles(true); + }; + + $scope.clearAllRoles = function () { + setAllViewRoles(false); + }; + + function setAllViewRoles(value) { + var viewRoles = $scope.permissionsEdit["VIEW.USER"]; + for (var role in viewRoles) { + if ($scope.clusterInheritedPermissionKeys.indexOf(role) !== -1) { + viewRoles[role] = value; + } + } + } }]); http://git-wip-us.apache.org/repos/asf/ambari/blob/e02110f1/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 6acf6c5..2321f5e 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 @@ -122,7 +122,9 @@ angular.module('ambariAdminConsole') 'confirmChange': 'Confirm Change', 'discard': 'Discard', 'remove': 'Remove', - 'update':'Update' + 'update':'Update', + 'checkAll': 'Check All', + 'clearAll': 'Clear All' }, 'alerts': { @@ -222,12 +224,14 @@ angular.module('ambariAdminConsole') 'urlDelete':'Delete URL', 'clusterPermissions': { - 'label': 'Inherit Cluster Permission', - 'allclusteradministrator': 'All Cluster Administrator', - 'allclusteroperator': 'All Cluster Operator', - 'allclusteruser': 'All Cluster User', - 'allserviceadministrator': 'All Service Administrator', - 'allserviceoperator': 'All Service Operator' + 'label': 'Local Cluster Permissions', + 'allclusteradministrator': 'Cluster Administrator', + 'allclusteroperator': 'Cluster Operator', + 'allclusteruser': 'Cluster User', + 'allserviceadministrator': 'Service Administrator', + 'allserviceoperator': 'Service Operator', + 'infoMessage': 'Grant <strong>Use</strong> permission for the following <strong>{{cluster}}</strong>', + 'nonLocalClusterMessage': 'The ability to inherit view <strong>Use</strong> permission based on Cluster Roles is only available when using a Local Cluster configuration.' }, 'alerts': { http://git-wip-us.apache.org/repos/asf/ambari/blob/e02110f1/ambari-admin/src/main/resources/ui/admin-web/app/styles/main.css ---------------------------------------------------------------------- diff --git a/ambari-admin/src/main/resources/ui/admin-web/app/styles/main.css b/ambari-admin/src/main/resources/ui/admin-web/app/styles/main.css index fbad224..0ad183c 100644 --- a/ambari-admin/src/main/resources/ui/admin-web/app/styles/main.css +++ b/ambari-admin/src/main/resources/ui/admin-web/app/styles/main.css @@ -721,15 +721,6 @@ table.no-border tr td{ /*.login-message-pane .well {height: 74px;} .login-message-pane input {margin-left: 3px;}*/ -.views-permissions-panel .panel-body{ - padding-bottom: 0; -} - -.views-permissions-panel .panel-body table{ - margin-bottom: 0; -} - - .views-list-pane accordion .panel-group .panel-heading{ cursor: pointer; } http://git-wip-us.apache.org/repos/asf/ambari/blob/e02110f1/ambari-admin/src/main/resources/ui/admin-web/app/views/ambariViews/edit.html ---------------------------------------------------------------------- diff --git a/ambari-admin/src/main/resources/ui/admin-web/app/views/ambariViews/edit.html b/ambari-admin/src/main/resources/ui/admin-web/app/views/ambariViews/edit.html index 92cde74..3a69a50 100644 --- a/ambari-admin/src/main/resources/ui/admin-web/app/views/ambariViews/edit.html +++ b/ambari-admin/src/main/resources/ui/admin-web/app/views/ambariViews/edit.html @@ -278,16 +278,23 @@ <div class="col-sm-12 cluster-inherited-permission"> <strong>{{'views.clusterPermissions.label' | translate}}</strong> </div> - <div class="col-sm-offset-3 col-sm-9"> - <div class="checkbox col-sm-4" ng-repeat="key in clusterInheritedPermissionKeys"> + <div class="col-sm-12"> + <span translate="views.clusterPermissions.infoMessage" translate-values="{cluster: cluster}"></span> + <div>{{'common.roles' | translate}}:</div> + </div> + <div class="col-sm-offset-2 col-sm-10"> + <div class="checkbox col-sm-12" ng-repeat="key in clusterInheritedPermissionKeys"> <div ng-init="i18nKey = 'views.clusterPermissions.' + key.split('.').join('').toLowerCase()"> <label> <input type="checkbox" ng-model="permissionsEdit['VIEW.USER'][key]"> {{i18nKey | translate}} </label> </div> </div> + <a href ng-click="checkAllRoles()">{{'common.controls.checkAll' | translate}}</a> | <a href ng-click="clearAllRoles()">{{'common.controls.clearAll' | translate}}</a> </div> - + </div> + <div ng-show="data.clusterType != 'LOCAL_AMBARI'" class="alert alert-info"> + <span translate="views.clusterPermissions.nonLocalClusterMessage"></span> </div> <div ng-show="isPermissionsEmpty"> <div class="alert alert-info">{{'views.alerts.notDefined' | translate: '{term: constants.perms}'}}</div>
