Repository: incubator-ranger Updated Branches: refs/heads/tag-policy f1e7e1577 -> f29f4fcd2
RANGER-609 : Limit the width of 'Policy Conditions' column in policy-edit page. Signed-off-by: Madhan Neethiraj <[email protected]> Project: http://git-wip-us.apache.org/repos/asf/incubator-ranger/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ranger/commit/f29f4fcd Tree: http://git-wip-us.apache.org/repos/asf/incubator-ranger/tree/f29f4fcd Diff: http://git-wip-us.apache.org/repos/asf/incubator-ranger/diff/f29f4fcd Branch: refs/heads/tag-policy Commit: f29f4fcd26fb49b9a077e84bc177ab24fa12436f Parents: f1e7e15 Author: Gautam Borad <[email protected]> Authored: Tue Aug 25 14:28:46 2015 +0530 Committer: Madhan Neethiraj <[email protected]> Committed: Tue Aug 25 11:24:06 2015 -0700 ---------------------------------------------------------------------- .../scripts/views/policies/PermissionList.js | 17 ++++++++++++----- security-admin/src/main/webapp/styles/xa.css | 4 ++++ 2 files changed, 16 insertions(+), 5 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/f29f4fcd/security-admin/src/main/webapp/scripts/views/policies/PermissionList.js ---------------------------------------------------------------------- diff --git a/security-admin/src/main/webapp/scripts/views/policies/PermissionList.js b/security-admin/src/main/webapp/scripts/views/policies/PermissionList.js index cbe389f..6be0329 100644 --- a/security-admin/src/main/webapp/scripts/views/policies/PermissionList.js +++ b/security-admin/src/main/webapp/scripts/views/policies/PermissionList.js @@ -393,6 +393,9 @@ define(function(require) { return '<div class="editable-address margin-bottom-5"><label style="display:block !important;"><span>'+obj.label+' : </span></label><input type="text" name="'+obj.name+'" ></div>' }); + //to show only mutiline line policy codition + this.multiLinecond = _.filter(that.policyConditions, function(m){ return (!_.isUndefined(m.evaluatorOptions['ui.isMultiline']) && m.evaluatorOptions['ui.isMultiline']) }); + this.multiLinecond = _.isArray(this.multiLinecond) ? this.multiLinecond : [this.multiLinecond]; //Create new bootstrap x-editable `policyConditions` dataType for policy conditions XAUtil.customXEditableForPolicyCond(tmpl.join('')); //create x-editable for policy conditions @@ -413,11 +416,18 @@ define(function(require) { if(_.isEmpty(val)){ return ''; } + //Add label for policy condition + var pcond = _.findWhere(that.multiLinecond, { 'name': name}) + if(!_.isUndefined(pcond) && !_.isUndefined(pcond['evaluatorOptions']) + && ! _.isUndefined(pcond['evaluatorOptions']["ui.isMultiline"]) + && ! _.isUndefined(pcond['evaluatorOptions']['engineName'])){ + val = pcond['evaluatorOptions']['engineName'] + ' Condition' + } i++; - return '<span class="'+label+'" >'+name+' : '+ val + '</span>'; + return '<span class="'+label+' white-space-normal" >'+name+' : '+ val + '</span>'; }); var cond = _.map(value, function(val, name) { - return {'type' : name, 'values' : !_.isArray(val) ? val.split(',') : val}; + return {'type' : name, 'values' : !_.isArray(val) ? val.split(', ') : val}; }); that.model.set('conditions', cond); @@ -460,9 +470,6 @@ define(function(require) { e.stopPropagation(); that.$('#policyConditions').editable('toggle'); }); - //to show only mutiline line policy codition - this.multiLinecond = _.filter(that.policyConditions, function(m){ return (!_.isUndefined(m.evaluatorOptions['ui.isMultiline']) && m.evaluatorOptions['ui.isMultiline']) }); - this.multiLinecond = _.isArray(this.multiLinecond) ? this.multiLinecond : [this.multiLinecond]; } }, http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/f29f4fcd/security-admin/src/main/webapp/styles/xa.css ---------------------------------------------------------------------- diff --git a/security-admin/src/main/webapp/styles/xa.css b/security-admin/src/main/webapp/styles/xa.css index 1a686d6..f53ebf2 100644 --- a/security-admin/src/main/webapp/styles/xa.css +++ b/security-admin/src/main/webapp/styles/xa.css @@ -1868,3 +1868,7 @@ input[type="radio"], input[type="checkbox"] {margin-top: 0;} text-align: center; margin-left: 10px; } +.white-space-normal{ + white-space: normal; + word-break: break-all; +} \ No newline at end of file
