You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ranger.apache.org by ma...@apache.org on 2015/10/27 02:08:20 UTC
[02/33] incubator-ranger git commit: RANGER-656 : Ranger UI - KMS
Need to handle 404 error when clicked on breadcrumb
RANGER-656 : Ranger UI - KMS Need to handle 404 error when clicked on breadcrumb
Signed-off-by: Velmurugan Periasamy <ve...@apache.org>
Project: http://git-wip-us.apache.org/repos/asf/incubator-ranger/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ranger/commit/d5c9dade
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ranger/tree/d5c9dade
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ranger/diff/d5c9dade
Branch: refs/heads/tag-policy
Commit: d5c9dade84984e995cb9a971be27db9331e14d02
Parents: adae750
Author: Gautam Borad <gb...@gmail.com>
Authored: Fri Sep 25 09:51:36 2015 +0530
Committer: Velmurugan Periasamy <ve...@apache.org>
Committed: Sun Sep 27 21:55:33 2015 -0400
----------------------------------------------------------------------
.../src/main/webapp/scripts/modules/XALinks.js | 42 +++-----------------
.../webapp/scripts/views/kms/KmsKeyCreate.js | 9 +++--
.../scripts/views/service/ServiceCreate.js | 2 +-
3 files changed, 11 insertions(+), 42 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/d5c9dade/security-admin/src/main/webapp/scripts/modules/XALinks.js
----------------------------------------------------------------------
diff --git a/security-admin/src/main/webapp/scripts/modules/XALinks.js b/security-admin/src/main/webapp/scripts/modules/XALinks.js
index efa3454..e15b45d 100755
--- a/security-admin/src/main/webapp/scripts/modules/XALinks.js
+++ b/security-admin/src/main/webapp/scripts/modules/XALinks.js
@@ -70,7 +70,7 @@ define(function(require) {
title: 'h.kms'
},
KmsKeyCreate : {
- href : '#!/kms/keys/create',
+ href : 'javascript:void(0);',
text : 'h.keyCreate',
title: 'h.keyCreate'
},
@@ -177,42 +177,10 @@ define(function(require) {
href : '#!/reports/audit/loginSession',
text : 'lbl.sessionDetail'
},
- AssetCreate : function(options){
- var href = '#!/asset/create';
- if(_.has(options,'model')){
- href = '#!/asset/create/'+options.model.get('assetType');
- }
- return {
- href : href,
- text : 'lbl.createAsset',
- title: 'lbl.createAsset'
- };
- },
- AssetEdit : function(options){
- var href = "javascript:void(0);";
- if(_.has(options,'model')){
- href = '#!/asset/'+options.model.get('id');
- }
- if(_.has(options,'id')){
- href = '#!/asset/'+options.id;
- }
- return {
- href : href,
- text : 'lbl.editService',
- title: 'lbl.editService'
- };
- },
-
- ServiceCreate : function(options){
- var href = '#!/service/create';
- if(_.has(options,'model')){
- href = '#!/service/create/'+options.model.get('assetType');
- }
- return {
- href : href,
- text : 'lbl.createService',
- title: 'lbl.createService'
- };
+ ServiceCreate : {
+ href : "javascript:void(0);",
+ text : 'lbl.createService',
+ title: 'lbl.createService'
},
ServiceEdit : function(options){
var href = "javascript:void(0);";
http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/d5c9dade/security-admin/src/main/webapp/scripts/views/kms/KmsKeyCreate.js
----------------------------------------------------------------------
diff --git a/security-admin/src/main/webapp/scripts/views/kms/KmsKeyCreate.js b/security-admin/src/main/webapp/scripts/views/kms/KmsKeyCreate.js
index 1ee0b3d..0bc62b6 100644
--- a/security-admin/src/main/webapp/scripts/views/kms/KmsKeyCreate.js
+++ b/security-admin/src/main/webapp/scripts/views/kms/KmsKeyCreate.js
@@ -166,13 +166,14 @@ define(function(require){
});
},
getKmsInfoFromServiceName : function() {
- var KmsServiceDef = require('models/RangerServiceDef');
- var KmsService = require('models/RangerService');
+ var KmsServiceDef = require('models/RangerServiceDef');
+ var KmsService = require('models/RangerService');
this.kmsService = new KmsService();
this.kmsService.url = XAUtil.getRangerServiceByName(this.kmsServiceName);
this.kmsService.fetch({ cache : false, async : false });
- this.kmsServiceDefModel = new KmsServiceDef({id : this.kmsService.id});
- this.kmsServiceDefModel.fetch({ cache : false, async : false })
+ this.kmsServiceDefModel = new KmsServiceDef();
+ this.kmsServiceDefModel.url = XAUtil.getRangerServiceDef(this.kmsService.get('type'));
+ this.kmsServiceDefModel.fetch({ cache : false, async : false });
},
/** on close */
onClose: function(){
http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/d5c9dade/security-admin/src/main/webapp/scripts/views/service/ServiceCreate.js
----------------------------------------------------------------------
diff --git a/security-admin/src/main/webapp/scripts/views/service/ServiceCreate.js b/security-admin/src/main/webapp/scripts/views/service/ServiceCreate.js
index 239b61e..f3b8d70 100644
--- a/security-admin/src/main/webapp/scripts/views/service/ServiceCreate.js
+++ b/security-admin/src/main/webapp/scripts/views/service/ServiceCreate.js
@@ -51,7 +51,7 @@ define(function(require){
if(this.model.isNew())
return [XALinks.get('ServiceManager'), XALinks.get('ServiceCreate', {model:this.model})];
else
- return [XALinks.get('ServiceManager'), XALinks.get('ServiceEdit',{model:this.model})];
+ return [XALinks.get('ServiceManager'), XALinks.get('ServiceEdit')];
},
/** Layout sub regions */