You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ranger.apache.org by ve...@apache.org on 2017/01/17 17:37:15 UTC
incubator-ranger git commit: RANGER-1305 : If servicedef has blank
configs : UI doesn't allow to add any configs to services of that servicedef
Repository: incubator-ranger
Updated Branches:
refs/heads/master a99e377d3 -> 7e1c021bd
RANGER-1305 : If servicedef has blank configs : UI doesn't allow to add any configs to services of that servicedef
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/7e1c021b
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ranger/tree/7e1c021b
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ranger/diff/7e1c021b
Branch: refs/heads/master
Commit: 7e1c021bd039d450c4bcdf1056273eee46618cf7
Parents: a99e377
Author: Mehul Parikh <me...@freestoneinfotech.com>
Authored: Mon Jan 16 16:18:55 2017 +0530
Committer: Velmurugan Periasamy <ve...@apache.org>
Committed: Tue Jan 17 12:37:00 2017 -0500
----------------------------------------------------------------------
.../scripts/views/policies/RangerPolicyForm.js | 15 --------
.../scripts/views/service/ServiceCreate.js | 2 +-
.../webapp/scripts/views/service/ServiceForm.js | 28 ++++++++-------
.../templates/service/ServiceForm_tmpl.html | 36 ++++++++++----------
4 files changed, 34 insertions(+), 47 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/7e1c021b/security-admin/src/main/webapp/scripts/views/policies/RangerPolicyForm.js
----------------------------------------------------------------------
diff --git a/security-admin/src/main/webapp/scripts/views/policies/RangerPolicyForm.js b/security-admin/src/main/webapp/scripts/views/policies/RangerPolicyForm.js
index 317c6ee..bdc2ef4 100644
--- a/security-admin/src/main/webapp/scripts/views/policies/RangerPolicyForm.js
+++ b/security-admin/src/main/webapp/scripts/views/policies/RangerPolicyForm.js
@@ -537,21 +537,6 @@ define(function(require){
return false;
}
},
- focus: function(event, ui) {
- var terms = split( this.value );
- terms.pop();
- terms.push( ui.item.value );
- this.value = terms.join( ", " );
- return false;
- },
- select: function( event, ui ) {
- var terms = split( this.value );
- terms.pop();
- terms.push( ui.item.value );
- terms.push( "" );
- this.value = terms.join( ", " );
- return false;
- }
},
beforeTagAdded: function(event, ui) {
http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/7e1c021b/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 c82f0af..f348744 100644
--- a/security-admin/src/main/webapp/scripts/views/service/ServiceCreate.js
+++ b/security-admin/src/main/webapp/scripts/views/service/ServiceCreate.js
@@ -242,7 +242,7 @@ define(function(require){
});
},
gotoResourceOrTagTab : function(){
- if(XAEnums.ServiceType.SERVICE_TAG.label == this.model.get('type')){
+ if(XAEnums.ServiceType.SERVICE_TAG.label == this.rangerServiceDefModel.get('name')){
App.appRouter.navigate("#!/policymanager/tag",{trigger: true});
return;
}
http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/7e1c021b/security-admin/src/main/webapp/scripts/views/service/ServiceForm.js
----------------------------------------------------------------------
diff --git a/security-admin/src/main/webapp/scripts/views/service/ServiceForm.js b/security-admin/src/main/webapp/scripts/views/service/ServiceForm.js
index c731cea..079ce00 100644
--- a/security-admin/src/main/webapp/scripts/views/service/ServiceForm.js
+++ b/security-admin/src/main/webapp/scripts/views/service/ServiceForm.js
@@ -152,21 +152,23 @@ define(function(require){
//Set configs for service
var config = {};
if(!_.isEmpty(this.rangerServiceDefModel.get('configs'))){
- _.each(this.rangerServiceDefModel.get('configs'),function(obj){
- if(!_.isNull(obj)){
- if(obj.type == 'bool'){
- config[obj.name] = that.getBooleanForConfig(obj, that.model);
- } else {
- config[obj.name] = _.isNull(that.model.get(obj.name)) ? "" : that.model.get(obj.name).toString();
- }
- if(!_.isNull(obj.name)) {
- that.model.unset(obj.name);
+ _.each(this.rangerServiceDefModel.get('configs'),function(obj){
+ if(!_.isNull(obj)){
+ if(obj.type == 'bool'){
+ config[obj.name] = that.getBooleanForConfig(obj, that.model);
+ } else {
+ config[obj.name] = _.isNull(that.model.get(obj.name)) ? "" : that.model.get(obj.name).toString();
+ }
+ if(!_.isNull(obj.name)) {
+ that.model.unset(obj.name);
+ }
}
- }
- });
- this.extraConfigColl.each(function(obj){ config[obj.get('name')] = obj.get('value');})
- this.model.set('configs',config);
+ });
}
+ this.extraConfigColl.each(function(obj){
+ if(!_.isEmpty(obj.attributes)) config[obj.get('name')] = obj.get('value');
+ });
+ this.model.set('configs',config);
//Set service type
this.model.set('type',this.rangerServiceDefModel.get('name'))
http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/7e1c021b/security-admin/src/main/webapp/templates/service/ServiceForm_tmpl.html
----------------------------------------------------------------------
diff --git a/security-admin/src/main/webapp/templates/service/ServiceForm_tmpl.html b/security-admin/src/main/webapp/templates/service/ServiceForm_tmpl.html
index a6f5ae6..391b68a 100644
--- a/security-admin/src/main/webapp/templates/service/ServiceForm_tmpl.html
+++ b/security-admin/src/main/webapp/templates/service/ServiceForm_tmpl.html
@@ -21,25 +21,25 @@
</p>
<div class="serviceDetail" data-fields={{serviceDetail}}></div>
</fieldset>
- {{#compare this.serviceConfig "neq" ''}}
- <fieldset class="configProp">
- <p class="formHeader">
- Config Properties :
- </p>
+ <fieldset class="configProp">
+ <p class="formHeader">
+ Config Properties :
+ </p>
+ {{#compare this.serviceConfig "neq" ''}}
<div class="serviceConfig" data-fields={{serviceConfig}}></div>
- <div class="extraServiceConfigs" ></div>
- </fieldset>
-
- <div>
- <div class="control-group field-username hdfs hive knox storm" style="display: block;">
- <label class="control-label" for="c12_username"></label>
- <div class="controls">
- <span data-editor="">
- <input data-id="testConn" type="button" value="Test Connection" class="btn" />
- </span>
-
- </div>
+ {{/compare}}
+ <div class="extraServiceConfigs" ></div>
+ </fieldset>
+
+ <div>
+ <div class="control-group field-username hdfs hive knox storm" style="display: block;">
+ <label class="control-label" for="c12_username"></label>
+ <div class="controls">
+ <span data-editor="">
+ <input data-id="testConn" type="button" value="Test Connection" class="btn" />
+ </span>
+
</div>
</div>
- {{/compare}}
+ </div>
</form>
\ No newline at end of file