Repository: incubator-ranger Updated Branches: refs/heads/master f66b885df -> 3a0b69e38
RANGER-1106 : issue after upgrade on ranger hive policy page Signed-off-by: Gautam Borad <[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/0f0f1d37 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ranger/tree/0f0f1d37 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ranger/diff/0f0f1d37 Branch: refs/heads/master Commit: 0f0f1d375abf5b3c640c53d75fff38c7405a4e38 Parents: f66b885 Author: Mehul Parikh <[email protected]> Authored: Mon Jul 18 00:51:35 2016 +0530 Committer: Gautam Borad <[email protected]> Committed: Tue Jul 19 17:38:47 2016 +0530 ---------------------------------------------------------------------- security-admin/src/main/webapp/scripts/utils/XAUtils.js | 4 ++++ .../scripts/views/policies/RangerPolicyTableLayout.js | 11 ++++++++++- 2 files changed, 14 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/0f0f1d37/security-admin/src/main/webapp/scripts/utils/XAUtils.js ---------------------------------------------------------------------- diff --git a/security-admin/src/main/webapp/scripts/utils/XAUtils.js b/security-admin/src/main/webapp/scripts/utils/XAUtils.js index 7c4e445..1cae3ed 100644 --- a/security-admin/src/main/webapp/scripts/utils/XAUtils.js +++ b/security-admin/src/main/webapp/scripts/utils/XAUtils.js @@ -1232,5 +1232,9 @@ define(function(require) { } return enableDenyAndExceptionsInPolicies; }; + XAUtils.isEmptyObjectResourceVal = function (obj) { + return !_.isUndefined(obj['resources']) && !_.isEmpty(obj['resources']) + && !_.isNull(obj['resources']) ? false : true; + }; return XAUtils; }); http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/0f0f1d37/security-admin/src/main/webapp/scripts/views/policies/RangerPolicyTableLayout.js ---------------------------------------------------------------------- diff --git a/security-admin/src/main/webapp/scripts/views/policies/RangerPolicyTableLayout.js b/security-admin/src/main/webapp/scripts/views/policies/RangerPolicyTableLayout.js index 8306a47..5b7f584 100644 --- a/security-admin/src/main/webapp/scripts/views/policies/RangerPolicyTableLayout.js +++ b/security-admin/src/main/webapp/scripts/views/policies/RangerPolicyTableLayout.js @@ -131,7 +131,7 @@ define(function(require){ this.renderTable(); this.initializePolicies(); }, - + /** all post render plugin initialization */ initializePlugins: function(){ }, @@ -144,6 +144,15 @@ define(function(require){ this.ui.policyTypeTab.find('ul li').removeClass('active'); this.$el.find('li[data-tab="rowLevelFilter"]').addClass('active'); } + this.showRequiredTabs() + }, + showRequiredTabs : function(){ + if(XAUtil.isEmptyObjectResourceVal(this.rangerServiceDefModel.get('dataMaskDef'))){ + this.$el.find('li[data-tab="masking"]').hide(); + } + if(XAUtil.isEmptyObjectResourceVal(this.rangerServiceDefModel.get('rowFilterDef'))){ + this.$el.find('li[data-tab="rowLevelFilter"]').hide(); + } }, renderTable : function(){ var that = this;
