remove permission inheritance

Author: Guite

bundles/org.zikula.modulestudio.generator/src/org/zikula/modulestudio/generator/cartridges/symfony/controller/helper/PermissionHelper.xtend

@@ -1,26 +1,18 @@
 package org.zikula.modulestudio.generator.cartridges.symfony.controller.helper
 
 import de.guite.modulestudio.metamodel.Application
-import de.guite.modulestudio.metamodel.Entity
-import de.guite.modulestudio.metamodel.ManyToManyPermissionInheritanceType
-import de.guite.modulestudio.metamodel.ManyToManyRelationship
-import de.guite.modulestudio.metamodel.Relationship
 import org.zikula.modulestudio.generator.application.IMostFileSystemAccess
 import org.zikula.modulestudio.generator.application.ImportList
 import org.zikula.modulestudio.generator.extensions.ControllerExtensions
 import org.zikula.modulestudio.generator.extensions.FormattingExtensions
 import org.zikula.modulestudio.generator.extensions.ModelBehaviourExtensions
-import org.zikula.modulestudio.generator.extensions.ModelJoinExtensions
-import org.zikula.modulestudio.generator.extensions.NamingExtensions
 import org.zikula.modulestudio.generator.extensions.Utils
 
 class PermissionHelper {
 
     extension ControllerExtensions = new ControllerExtensions
     extension FormattingExtensions = new FormattingExtensions
     extension ModelBehaviourExtensions = new ModelBehaviourExtensions
-    extension ModelJoinExtensions = new ModelJoinExtensions
-    extension NamingExtensions = new NamingExtensions
     extension Utils = new Utils
 
     def generate(Application it, IMostFileSystemAccess fsa) {
@@ -120,17 +112,6 @@ class PermissionHelper {
             $objectType = $entity->get_objectType();
             $instance = $entity->getKey() . '::';
 
-            «IF hasEntitiesInheritingPermissions»
-                // check inherited permissions
-                «FOR entity : getEntitiesInheritingPermissions»
-                    if ('«entity.name.formatForCode»' === $objectType) {
-                        «FOR relation : entity.getBidirectionalIncomingPermissionInheriters»
-                            «entity.inheritedPermissionCheck(relation)»
-                        «ENDFOR»
-                    }
-                «ENDFOR»
-
-            «ENDIF»
             return $this->permissionApi->hasPermission(
                 '«appName»:' . ucfirst($objectType) . ':',
                 $instance,
@@ -158,46 +139,6 @@ class PermissionHelper {
         «ENDIF»
     '''
 
-    def private hasEntitiesInheritingPermissions(Application it) {
-        !getEntitiesInheritingPermissions.empty
-    }
-
-    def private getEntitiesInheritingPermissions(Application it) {
-        entities.filter[!getBidirectionalIncomingPermissionInheriters.empty]
-    }
-
-    def dispatch private inheritedPermissionCheck(Entity it, Relationship relation) '''
-        if (null !== $entity->get«relation.getRelationAliasName(false).formatForCodeCapital»()) {
-            $parent = $entity->get«relation.getRelationAliasName(false).formatForCodeCapital»();
-            if (!$this->hasEntityPermission($parent, $permissionLevel, $userId)) {
-                return false;
-            }
-        }
-    '''
-
-    def dispatch private inheritedPermissionCheck(Entity it, ManyToManyRelationship relation) '''
-        «IF relation.inheritPermissions == ManyToManyPermissionInheritanceType.AFFIRMATIVE»
-            $parentAccess = false;
-        «ENDIF»
-        foreach ($entity->get«relation.getRelationAliasName(false).formatForCodeCapital»() as $parent) {
-            «IF relation.inheritPermissions == ManyToManyPermissionInheritanceType.AFFIRMATIVE»
-                if ($this->hasEntityPermission($parent, $permissionLevel, $userId)) {
-                    $parentAccess = true;
-                    break;
-                }
-            «ELSEIF ManyToManyPermissionInheritanceType.UNANIMOUS == relation.inheritPermissions»
-                if (!$this->hasEntityPermission($parent, $permissionLevel, $userId)) {
-                    return false;
-                }
-            «ENDIF»
-        }
-        «IF ManyToManyPermissionInheritanceType.AFFIRMATIVE == relation.inheritPermissions»
-            if (true !== $parentAccess) {
-                return false;
-            }
-        «ENDIF»
-    '''
-
     def private helperMethods(Application it) '''
         /**
          * Checks if a certain permission level is granted for the given object type.

bundles/org.zikula.modulestudio.generator/src/org/zikula/modulestudio/generator/extensions/ModelJoinExtensions.xtend

@@ -4,7 +4,6 @@ import de.guite.modulestudio.metamodel.Application
 import de.guite.modulestudio.metamodel.CascadeType
 import de.guite.modulestudio.metamodel.Entity
 import de.guite.modulestudio.metamodel.Field
-import de.guite.modulestudio.metamodel.ManyToManyPermissionInheritanceType
 import de.guite.modulestudio.metamodel.ManyToManyRelationship
 import de.guite.modulestudio.metamodel.ManyToOneRelationship
 import de.guite.modulestudio.metamodel.OneToManyRelationship
@@ -68,15 +67,6 @@ class ModelJoinExtensions {
             + incoming.filter(ManyToManyRelationship).filter[bidirectional]
     }
 
-    /**
-     * Returns a list of all incoming bidirectional join relations which inherit permissions.
-     */
-    def getBidirectionalIncomingPermissionInheriters(Entity it) {
-        incoming.filter(OneToOneRelationship).filter[bidirectional && inheritPermissions]
-            + incoming.filter(OneToManyRelationship).filter[bidirectional && inheritPermissions]
-            + incoming.filter(ManyToManyRelationship).filter[bidirectional && inheritPermissions != ManyToManyPermissionInheritanceType.NONE]
-    }
-
     /**
      * Returns a list of all incoming bidirectional join relations (excluding inheritance)
      * which are not nullable.

bundles/org.zikula.modulestudio.generator/src/org/zikula/modulestudio/generator/extensions/ViewExtensions.xtend

@@ -58,7 +58,7 @@ class ViewExtensions {
 
         if (standardFields) weight = weight + 1
         if (geographical) weight = weight + 1
-        //if (tree != EntityTreeType.NONE) weight = weight + 1
+        //if (tree) weight = weight + 1
         weight
     }