Revert "RANGER-2647 : Show display name instead of name in UI"
This reverts commit 51349e296be6cf83da1f775138b51b175f1f47e7.
diff --git a/security-admin/src/main/webapp/scripts/models/RangerServiceDef.js b/security-admin/src/main/webapp/scripts/models/RangerServiceDef.js
index 9a89960..e5a28e8 100644
--- a/security-admin/src/main/webapp/scripts/models/RangerServiceDef.js
+++ b/security-admin/src/main/webapp/scripts/models/RangerServiceDef.js
@@ -25,7 +25,6 @@
var XAUtils = require('utils/XAUtils');
var XAEnums = require('utils/XAEnums');
var localization= require('utils/XALangSupport');
- var RangerService = require('models/RangerService');
var RangerServiceDef = RangerServiceDefBase.extend(
/** @lends RangerServiceDef.prototype */
@@ -55,16 +54,15 @@
// Overwrite your schema definition here
return _.extend(attrs,{
+ displayName : {
+ type : 'Text',
+ title : 'Display Name'
+ },
name : {
type : 'Text',
title : 'Service Name *',
- validators : ['required',{type:'regexp', regexp:/^[a-zA-Z0-9_-][a-zA-Z0-9\s_-]{0,254}$/,message : localization.tt("validationMessages.nameValidationMsg")}],
- },
- displayName : {
- type : 'Text',
- title : 'Display Name',
- validators : [{type:'regexp', regexp:/^[a-zA-Z0-9_-][a-zA-Z0-9\s_-]{0,254}$/, message :'Invalid email address', message : localization.tt("validationMessages.nameValidationMsg")}]
+ validators : ['required',{type:'regexp',regexp:/^[a-zA-Z0-9_-][a-zA-Z0-9\s_-]{0,254}$/,message : localization.tt("validationMessages.nameValidationMsg")}],
},
description : {
type : 'TextArea',
@@ -98,14 +96,7 @@
width :'220px',
allowClear: true,
initSelection : function (element, callback) {
- var rangerService = new RangerService()
- rangerService.url = '/service/plugins/services/name/'+element.val();
- rangerService.fetch( {
- cache : false,
- async : false,
- }).done(function(m) {
- callback( { id:_.escape(m.get('name')), text:_.escape(m.get('displayName')) })
- })
+ callback( { id:_.escape(element.val()), text:_.escape(element.val()) })
},
ajax: {
url: "service/plugins/services",
@@ -116,10 +107,8 @@
results: function (data, page) {
var results = [];
if(data.resultSize != "0"){
- results = data.services.map(function(m, i){ return {id : _.escape(m.name), text: _.escape(m.displayName) }});
- }
- if($.find('[name="tagService"]') && !_.isEmpty($.find('[name="tagService"]')[0].value)) {
- results = _.reject(results, function(m) {return m.id == $.find('[name="tagService"]')[0].value});
+ results = data.services.map(function(m, i){ return {id : _.escape(m.name), text: _.escape(m.name) }; });
+ return {results : results};
}
return {results : results};
},
diff --git a/security-admin/src/main/webapp/scripts/modules/XALinks.js b/security-admin/src/main/webapp/scripts/modules/XALinks.js
index 5420f11..dc3e417 100755
--- a/security-admin/src/main/webapp/scripts/modules/XALinks.js
+++ b/security-admin/src/main/webapp/scripts/modules/XALinks.js
@@ -215,8 +215,8 @@
}
return {
href : href,
- text : options.model.get('displayName') +' Policies',
- title: options.model.get('displayName') +' Policies'
+ text : options.model.get('name') +' Policies',
+ title: options.model.get('name') +' Policies'
};
},
ManageHivePolicies : function(options){
diff --git a/security-admin/src/main/webapp/scripts/modules/globalize/message/en.js b/security-admin/src/main/webapp/scripts/modules/globalize/message/en.js
index a559248..1695769 100644
--- a/security-admin/src/main/webapp/scripts/modules/globalize/message/en.js
+++ b/security-admin/src/main/webapp/scripts/modules/globalize/message/en.js
@@ -278,7 +278,6 @@
userWithGrantRolePrivilege : 'Users (Grant privilege)',
groupWithGrantRolePrivilege : 'Groups (Grant privilege)',
applicationType : 'Application',
- displayName : 'Display Name',
},
btn : {
diff --git a/security-admin/src/main/webapp/scripts/views/policymanager/ServiceLayout.js b/security-admin/src/main/webapp/scripts/views/policymanager/ServiceLayout.js
index d190686..1d95ff3 100644
--- a/security-admin/src/main/webapp/scripts/views/policymanager/ServiceLayout.js
+++ b/security-admin/src/main/webapp/scripts/views/policymanager/ServiceLayout.js
@@ -280,7 +280,6 @@
var view = new RangerServiceViewDetail({
serviceDef : serviceDef,
rangerService : rangerService,
- rangerSeviceList : that.services,
});
var modal = new Backbone.BootstrapModal({
diff --git a/security-admin/src/main/webapp/scripts/views/service/RangerServiceViewDetail.js b/security-admin/src/main/webapp/scripts/views/service/RangerServiceViewDetail.js
index a79513b..24aeedb 100644
--- a/security-admin/src/main/webapp/scripts/views/service/RangerServiceViewDetail.js
+++ b/security-admin/src/main/webapp/scripts/views/service/RangerServiceViewDetail.js
@@ -35,21 +35,17 @@
template: RangerServiceViewDetailTmpl,
templateHelpers: function() {
- var that = this, tagDetails = [];
- if(this.options.rangerService.get('tagService') && !_.isEmpty(this.options.rangerService.get('tagService'))) {
- tagDetails = this.options.rangerSeviceList.find(function(m) {
- return m.get('name') == that.options.rangerService.get('tagService')
- })
- }
+ var that = this;
+
return {
- configsList : this.conf,
- customConfigs : this.customConfigs,
- serviceName : this.options.rangerService.get('name'),
- description : this.options.rangerService.get('description'),
- isEnabled : this.options.rangerService.get('isEnabled'),
- tagService : (!_.isEmpty(tagDetails)) ? tagDetails.get('displayName') : false,
- displayName : this.options.rangerService.get('displayName'),
- }
+ configsList : this.conf,
+ customConfigs : this.customConfigs,
+ serviceName : this.options.rangerService.get('name'),
+ description : this.options.rangerService.get('description'),
+ isEnabled : this.options.rangerService.get('isEnabled'),
+ tagService : (this.options.rangerService.get('tagService')) ? this.options.rangerService.get('tagService') : false,
+ displayName : this.options.rangerService.get('displayName'),
+ }
},
/**
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 975aeb1..59df159 100644
--- a/security-admin/src/main/webapp/scripts/views/service/ServiceForm.js
+++ b/security-admin/src/main/webapp/scripts/views/service/ServiceForm.js
@@ -82,7 +82,7 @@
* Override here ONLY if special case!!
*/
- fields: ['name', 'displayName', 'description', 'isEnabled', 'type','configs', '_vPassword'],
+ fields: ['displayName', 'name', 'description', 'isEnabled', 'type','configs', '_vPassword'],
schema : function(){
var attrs = _.pick(_.result(this.rangerServiceDefModel,'schemaBase'), this.getSerivceBaseFieldNames());
@@ -225,7 +225,7 @@
}
},
getSerivceBaseFieldNames : function(){
- var fields = ['name', 'displayName', 'description', 'isEnabled','tagService']
+ var fields = ['displayName', 'name', 'description', 'isEnabled','tagService']
return this.rangerServiceDefModel.get('name') == XAEnums.ServiceType.SERVICE_TAG.label ? fields.slice(0,fields.indexOf("tagService")) : fields;
}
});
diff --git a/security-admin/src/main/webapp/templates/policies/RangerPolicyTableLayout_tmpl.html b/security-admin/src/main/webapp/templates/policies/RangerPolicyTableLayout_tmpl.html
index 9dd14c7..a2b930f 100644
--- a/security-admin/src/main/webapp/templates/policies/RangerPolicyTableLayout_tmpl.html
+++ b/security-admin/src/main/webapp/templates/policies/RangerPolicyTableLayout_tmpl.html
@@ -33,7 +33,7 @@
{{/if}}
</ul>
</div>
-<h3 class="wrap-header bold"> {{tt 'lbl.listOfPolicies'}} : {{rangerService.attributes.displayName}} </h3>
+<h3 class="wrap-header bold"> {{tt 'lbl.listOfPolicies'}} : {{rangerService.attributes.name}} </h3>
<div class="wrap non-collapsible m-height ">
<div>
<div class="row-fluid margin-bottom-11">
diff --git a/security-admin/src/main/webapp/templates/service/RangerServiceViewDetail_tmpl.html b/security-admin/src/main/webapp/templates/service/RangerServiceViewDetail_tmpl.html
index 978d785..e3a2e67 100644
--- a/security-admin/src/main/webapp/templates/service/RangerServiceViewDetail_tmpl.html
+++ b/security-admin/src/main/webapp/templates/service/RangerServiceViewDetail_tmpl.html
@@ -22,14 +22,6 @@
<tbody>
<tr>
<td>
- {{tt 'lbl.serviceName'}}
- </td>
- <td>
- {{serviceName}}
- </td>
- </tr>
- <tr>
- <td>
{{tt 'lbl.displayName'}}
</td>
<td>
@@ -38,6 +30,14 @@
</tr>
<tr>
<td>
+ {{tt 'lbl.serviceName'}}
+ </td>
+ <td>
+ {{serviceName}}
+ </td>
+ </tr>
+ <tr>
+ <td>
{{tt 'lbl.description'}}
</td>
{{#if description}}
