This is an automated email from the ASF dual-hosted git repository.
ni3galave pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/ranger.git
The following commit(s) were added to refs/heads/master by this push:
new 23d2b93 RANGER-2648 : Provide policy list page url with service name
23d2b93 is described below
commit 23d2b935c87a7cb3bf30e562660f897d9afc2fc2
Author: Nitin Galave <[email protected]>
AuthorDate: Wed Nov 20 17:44:25 2019 +0530
RANGER-2648 : Provide policy list page url with service name
---
.../main/webapp/scripts/controllers/Controller.js | 60 +++++++++++++++-------
.../src/main/webapp/scripts/utils/XAUtils.js | 5 ++
2 files changed, 46 insertions(+), 19 deletions(-)
diff --git a/security-admin/src/main/webapp/scripts/controllers/Controller.js
b/security-admin/src/main/webapp/scripts/controllers/Controller.js
index 523aadb..072323a 100755
--- a/security-admin/src/main/webapp/scripts/controllers/Controller.js
+++ b/security-admin/src/main/webapp/scripts/controllers/Controller.js
@@ -285,9 +285,15 @@ define(function(require) {
var view =
require('views/service/ServiceCreate');
var RangerServiceDef = require('models/RangerServiceDef');
var RangerService = require('models/RangerService');
+ var XAUtil = require('utils/XAUtils');
var rangerServiceDefModel = new RangerServiceDef({ id :
serviceTypeId });
- var rangerService = new RangerService({ 'id' : serviceId });
+ if(_.isNaN(parseInt(serviceId))){
+ var rangerService = new RangerService();
+ rangerService.url = XAUtil.getServiceByName(serviceId);
+ } else {
+ var rangerService = new RangerService({id : serviceId});
+ }
rangerService.fetch({
cache:false
@@ -306,27 +312,37 @@ define(function(require) {
var RangerService = require('models/RangerService');
var RangerPolicyList =
require('collections/RangerPolicyList');
- var rangerService = new RangerService({id : serviceId});
var rangerPolicyList = new RangerPolicyList();
rangerPolicyList.queryParams['policyType'] = policyType;
-
+ if(_.isNaN(parseInt(serviceId))){
+ var rangerService = new RangerService();
+ rangerService.url = XAUtil.getServiceByName(serviceId);
+ } else {
+ var rangerService = new RangerService({id :
serviceId});
+ }
rangerService.fetch({
cache : false,
async : false
+ }).done( function() {
+ App.rContent.show(new view({
+ rangerService : rangerService,
+ collection : rangerPolicyList
+ }));
});
- App.rContent.show(new view({
- rangerService : rangerService,
- collection : rangerPolicyList
- }));
},
RangerPolicyCreateAction :function(serviceId, policyType){
MAppState.set({ 'currentTab' : XAGlobals.AppTabs.AccessManager.value
});
-
+ var XAUtil = require('utils/XAUtils');
var view =
require('views/policies/RangerPolicyCreate');
var RangerService = require('models/RangerService');
var RangerPolicy =
require('models/RangerPolicy');
- var rangerService = new RangerService({id : serviceId});
+ if(_.isNaN(parseInt(serviceId))){
+ var rangerService = new RangerService();
+ rangerService.url = XAUtil.getServiceByName(serviceId);
+ } else {
+ var rangerService = new RangerService({id :
serviceId});
+ }
rangerService.fetch({
cache : false,
}).done(function(){
@@ -345,22 +361,28 @@ define(function(require) {
var RangerPolicyList =
require('collections/RangerPolicyList');
var XAUtil = require('utils/XAUtils');
- var rangerService = new RangerService({id : serviceId});
var rangerPolicy = new RangerPolicy({ id : policyId});
+ if(_.isNaN(parseInt(serviceId))){
+ var rangerService = new RangerService();
+ rangerService.url = XAUtil.getServiceByName(serviceId);
+ } else {
+ var rangerService = new RangerService({id :
serviceId});
+ }
rangerPolicy.collection =new RangerPolicyList();
rangerPolicy.collection.url =
XAUtil.getServicePoliciesURL(serviceId);
rangerService.fetch({
cache : false,
async : false,
- });
- rangerPolicy.fetch({
- cache : false,
- }).done(function(){
- App.rContent.show(new view({
- model : rangerPolicy,
- rangerService :rangerService
- }));
- });
+ }).done( function() {
+ rangerPolicy.fetch({
+ cache : false,
+ }).done(function(){
+ App.rContent.show(new view({
+ model : rangerPolicy,
+ rangerService :rangerService
+ }));
+ });
+ });
},
/************PERMISSIONS LISTING
*****************************************/
modulePermissionsAction :function(){
diff --git a/security-admin/src/main/webapp/scripts/utils/XAUtils.js
b/security-admin/src/main/webapp/scripts/utils/XAUtils.js
index 80277f6..f0e0be0 100644
--- a/security-admin/src/main/webapp/scripts/utils/XAUtils.js
+++ b/security-admin/src/main/webapp/scripts/utils/XAUtils.js
@@ -1738,5 +1738,10 @@ define(function(require) {
});
};
+ //Get service details By Service name
+ XAUtils.getServiceByName = function(name) {
+ return "/service/plugins/services/name/" + name
+ };
+
return XAUtils;
});
\ No newline at end of file
