Return-Path: X-Original-To: archive-asf-public-internal@cust-asf2.ponee.io Delivered-To: archive-asf-public-internal@cust-asf2.ponee.io Received: from cust-asf.ponee.io (cust-asf.ponee.io [163.172.22.183]) by cust-asf2.ponee.io (Postfix) with ESMTP id D6EF6200CDB for ; Fri, 30 Jun 2017 15:38:01 +0200 (CEST) Received: by cust-asf.ponee.io (Postfix) id D4C55160C03; Fri, 30 Jun 2017 13:38:01 +0000 (UTC) Delivered-To: archive-asf-public@cust-asf.ponee.io Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by cust-asf.ponee.io (Postfix) with SMTP id 70870160BDD for ; Fri, 30 Jun 2017 15:38:00 +0200 (CEST) Received: (qmail 77467 invoked by uid 500); 30 Jun 2017 13:37:55 -0000 Mailing-List: contact commits-help@ambari.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: ambari-dev@ambari.apache.org Delivered-To: mailing list commits@ambari.apache.org Received: (qmail 77243 invoked by uid 99); 30 Jun 2017 13:37:55 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 30 Jun 2017 13:37:55 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 71574F5500; Fri, 30 Jun 2017 13:37:52 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: ababiichuk@apache.org To: commits@ambari.apache.org Date: Fri, 30 Jun 2017 13:38:30 -0000 Message-Id: In-Reply-To: <6c685fcac60e4e089f9804d5397df8cd@git.apache.org> References: <6c685fcac60e4e089f9804d5397df8cd@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [40/63] [abbrv] ambari git commit: AMBARI-21172 - Delete view privileges from the Groups page (Anita Jebaraj via sangeetar) archived-at: Fri, 30 Jun 2017 13:38:02 -0000 AMBARI-21172 - Delete view privileges from the Groups page (Anita Jebaraj via sangeetar) Project: http://git-wip-us.apache.org/repos/asf/ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/86347182 Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/86347182 Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/86347182 Branch: refs/heads/branch-feature-logsearch-ui Commit: 86347182a99209dcd767240ae475a03549acd989 Parents: 3529d05 Author: Sangeeta Ravindran Authored: Tue Jun 27 10:49:43 2017 -0700 Committer: Sangeeta Ravindran Committed: Tue Jun 27 10:49:43 2017 -0700 ---------------------------------------------------------------------- .../scripts/controllers/groups/GroupsEditCtrl.js | 19 +++++++++++++++++-- .../ui/admin-web/app/views/groups/edit.html | 3 +++ 2 files changed, 20 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ambari/blob/86347182/ambari-admin/src/main/resources/ui/admin-web/app/scripts/controllers/groups/GroupsEditCtrl.js ---------------------------------------------------------------------- diff --git a/ambari-admin/src/main/resources/ui/admin-web/app/scripts/controllers/groups/GroupsEditCtrl.js b/ambari-admin/src/main/resources/ui/admin-web/app/scripts/controllers/groups/GroupsEditCtrl.js index 92406e9..21d0fd6 100644 --- a/ambari-admin/src/main/resources/ui/admin-web/app/scripts/controllers/groups/GroupsEditCtrl.js +++ b/ambari-admin/src/main/resources/ui/admin-web/app/scripts/controllers/groups/GroupsEditCtrl.js @@ -129,6 +129,20 @@ angular.module('ambariAdminConsole') }); }; + + $scope.removePrivilege = function(name, privilege) { + var privilegeObject = { + id: privilege.privilege_id, + view_name: privilege.view_name, + version: privilege.version, + instance_name: name + }; + View.deletePrivilege(privilegeObject).then(function() { + loadPrivileges(); + }); + }; + +function loadPrivileges() { // Load privileges Group.getPrivileges($routeParams.id).then(function(data) { var privileges = { @@ -145,6 +159,7 @@ angular.module('ambariAdminConsole') privileges.views[privilege.instance_name] = privileges.views[privilege.instance_name] || { privileges:[]}; privileges.views[privilege.instance_name].version = privilege.version; privileges.views[privilege.instance_name].view_name = privilege.view_name; + privileges.views[privilege.instance_name].privilege_id = privilege.privilege_id; privileges.views[privilege.instance_name].privileges.push(privilege.permission_label); } }); @@ -157,6 +172,6 @@ angular.module('ambariAdminConsole') }).catch(function(data) { Alert.error($t('common.alerts.cannotLoadPrivileges'), data.data.message); }); - - +} +loadPrivileges(); }]); http://git-wip-us.apache.org/repos/asf/ambari/blob/86347182/ambari-admin/src/main/resources/ui/admin-web/app/views/groups/edit.html ---------------------------------------------------------------------- diff --git a/ambari-admin/src/main/resources/ui/admin-web/app/views/groups/edit.html b/ambari-admin/src/main/resources/ui/admin-web/app/views/groups/edit.html index e472ede..1aafd03 100644 --- a/ambari-admin/src/main/resources/ui/admin-web/app/views/groups/edit.html +++ b/ambari-admin/src/main/resources/ui/admin-web/app/views/groups/edit.html @@ -83,6 +83,9 @@ {{item | translate}}{{$last ? '' : ', '}} + + + {{'common.alerts.noPrivileges' | translate: '{term: constants.view}'}}