KYLO-3170 cannot delete template with entity access turned off

chandrasaripaka · Dec 4, 2018 · 0859706 · 0859706
1 parent e313564
commit 0859706
Showing 1 changed file with 4 additions and 1 deletion.
diff --git a/.../main/java/com/thinkbiganalytics/metadata/modeshape/template/JcrFeedTemplateProvider.java b/.../main/java/com/thinkbiganalytics/metadata/modeshape/template/JcrFeedTemplateProvider.java
@@ -188,7 +188,10 @@ public boolean deleteTemplate(FeedManagerTemplate.ID id) throws TemplateDeletion
 
     public boolean deleteTemplate(FeedManagerTemplate feedManagerTemplate) throws TemplateDeletionException {
         if (feedManagerTemplate != null && (feedManagerTemplate.getFeeds() == null || feedManagerTemplate.getFeeds().size() == 0)) {
-            feedManagerTemplate.getAllowedActions().checkPermission(TemplateAccessControl.DELETE);
+
+            if(accessController.isEntityAccessControlled()) {
+                feedManagerTemplate.getAllowedActions().checkPermission(TemplateAccessControl.DELETE);
+            }
             addPostFeedChangeAction(feedManagerTemplate, ChangeType.DELETE);
             super.delete(feedManagerTemplate);
             return true;