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 fe8df85 RANGER-2335: Overlapping of 'include' toggle button on policy
create/edit page.
fe8df85 is described below
commit fe8df8598ac9ec73914b0981723f8d34e235f7b5
Author: Nitin Galave <[email protected]>
AuthorDate: Tue Feb 19 18:20:45 2019 +0530
RANGER-2335: Overlapping of 'include' toggle button on policy create/edit
page.
---
.../src/main/webapp/scripts/modules/XAOverrides.js | 15 +++++++++------
.../main/webapp/scripts/views/policies/RangerPolicyRO.js | 5 +++--
security-admin/src/main/webapp/styles/xa.css | 16 ++++++++--------
.../webapp/templates/policies/RangerPolicyRO_tmpl.html | 9 +--------
4 files changed, 21 insertions(+), 24 deletions(-)
diff --git a/security-admin/src/main/webapp/scripts/modules/XAOverrides.js
b/security-admin/src/main/webapp/scripts/modules/XAOverrides.js
index c45f74d..7af481f 100644
--- a/security-admin/src/main/webapp/scripts/modules/XAOverrides.js
+++ b/security-admin/src/main/webapp/scripts/modules/XAOverrides.js
@@ -724,26 +724,29 @@
}
},
getTemplate : function() {
- var that = this , resourcesType ,
optionsHtml="" , selectTemplate = '', excludeSupportToggleDiv='',
recursiveSupportToggleDiv='', klass = '';
- this.preserveResourceValues = {} ;
+ var that = this , resourcesType , optionsHtml="" ,
selectTemplate = '', excludeSupportToggleDiv='', recursiveSupportToggleDiv='',
+ recursiveTogglePosition = '', includeTogglePosition = '';
+ this.preserveResourceValues = {} ;
if(this.resourcesAtSameLevel){
_.each(this.sameLevelOpts,
function(option){ return optionsHtml += "<option
value='"+option+"'>"+option+"</option>"; },this);
selectTemplate = '<select
data-js="resourceType" class="btn dropdown-toggle sameLevelDropdown" >\
'+optionsHtml+'\
</select>';
}
- excludeSupportToggleDiv = '<div
class="toggle-xa include-toggle" data-js="include" style ="height: 20px; width:
80px;"><div class="toggle"></div></div>';
_.each(this.form.rangerServiceDefModel.get('resources') , function(m){
if(that.name === m.name){
resourcesType = m.type ;
}
})
if(resourcesType == "path"){
- klass = (!this.excludeSupport) ?
"recursive-toggle-hdfs-1" : "recursive-toggle-hdfs-2";
+ recursiveTogglePosition = (!this.excludeSupport) ?
"recursive-toggle-hdfs-1" : "recursive-toggle-hdfs-2";
+ includeTogglePosition = "include-toggle-1";
}else{
- klass = (!this.excludeSupport) ?
"recursive-toggle-1" : "recursive-toggle-2";
+ recursiveTogglePosition = (!this.excludeSupport) ?
"recursive-toggle-1" : "recursive-toggle-2";
+ includeTogglePosition = "include-toggle";
}
- recursiveSupportToggleDiv = '<div
class="toggle-xa recursive-toggle '+klass+'"" data-js="recursive"
style="height: 20px; width: 120px;"><div class="toggle"></div></div>';
+ excludeSupportToggleDiv = '<div class="toggle-xa
'+includeTogglePosition+'" data-js="include" style ="height: 20px; width:
80px;"><div class="toggle"></div></div>';
+ recursiveSupportToggleDiv = '<div class="toggle-xa
recursive-toggle '+recursiveTogglePosition+'"" data-js="recursive"
style="height: 20px; width: 120px;"><div class="toggle"></div></div>';
return _.template(selectTemplate+'<input
data-js="resource" type="text">'+
excludeSupportToggleDiv+''+recursiveSupportToggleDiv);
diff --git
a/security-admin/src/main/webapp/scripts/views/policies/RangerPolicyRO.js
b/security-admin/src/main/webapp/scripts/views/policies/RangerPolicyRO.js
index e494bcc..da0078f 100644
--- a/security-admin/src/main/webapp/scripts/views/policies/RangerPolicyRO.js
+++ b/security-admin/src/main/webapp/scripts/views/policies/RangerPolicyRO.js
@@ -139,8 +139,9 @@ define(function(require) {
resource.label = def.label;
resource.values =
policyResources.values;
if(def.recursiveSupported){
- details.isRecursive =
policyResources.isRecursive ? 'ON': 'OFF';
- } else if(def.excludesSupported){
+ resource.Rec_Recursive =
policyResources.isRecursive ? XAEnums.RecursiveStatus.STATUS_RECURSIVE.label :
XAEnums.RecursiveStatus.STATUS_NONRECURSIVE.label;
+ }
+ if(def.excludesSupported){
resource.Rec_Exc =
policyResources.isExcludes ? XAEnums.ExcludeStatus.STATUS_EXCLUDE.label :
XAEnums.ExcludeStatus.STATUS_INCLUDE.label;
}
details.resources.push(resource);
diff --git a/security-admin/src/main/webapp/styles/xa.css
b/security-admin/src/main/webapp/styles/xa.css
index 7fb868d..1e144d3 100644
--- a/security-admin/src/main/webapp/styles/xa.css
+++ b/security-admin/src/main/webapp/styles/xa.css
@@ -1812,10 +1812,6 @@ margin-bottom: 5px;
margin-top: -29px;
width:80px;
}
-.recursive-toggle-path {
-margin-left: 347px;
-margin-top: -29px;
-}
.policy-form .help-inline {
position: relative;
top: 10px;
@@ -2229,16 +2225,20 @@ td.subgrid-custom-cell{
}
.recursive-toggle-2 {
margin-left: 363px;
- margin-top: -20px;
+ margin-top: -22px;
width:110px;
}
.recursive-toggle-hdfs-1{
margin-left: 348px;
- margin-top: -27px;
+ margin-top: -29px;
}
.recursive-toggle-hdfs-2{
- margin-left: 388px;
- margin-top: -27px;
+ margin-left: 443px;
+ margin-top: -22px;
+}
+.include-toggle-1{
+ margin-left: 348px;
+ margin-top: -29px;
}
.subgridTable{
width : 25% !important;
diff --git
a/security-admin/src/main/webapp/templates/policies/RangerPolicyRO_tmpl.html
b/security-admin/src/main/webapp/templates/policies/RangerPolicyRO_tmpl.html
index 856e92a..26b43f7 100644
--- a/security-admin/src/main/webapp/templates/policies/RangerPolicyRO_tmpl.html
+++ b/security-admin/src/main/webapp/templates/policies/RangerPolicyRO_tmpl.html
@@ -66,6 +66,7 @@
{{#each this.values}}
<span class="label label-info">{{this}}</span>
{{/each}}
+ <span class="label label-inverse pull-right
m-l-sm">{{this.Rec_Recursive}}</span>
<span class="label label-inverse pull-right">{{this.Rec_Exc}}</span>
</td>
</tr>
@@ -84,14 +85,6 @@
</td>
{{/ifCond}}
</tr>
- {{#if PolicyDetails.isRecursive}}
- <tr>
- <td>Recursive</td>
- <td>
- <span class="label label-info">{{PolicyDetails.isRecursive}}</span>
- </td>
- </tr>
- {{/if}}
<tr>
<td>
{{tt 'lbl.auditLogging'}}
