OI-74: Implemented hook_entity_access instead of changing access hand…

…ler.
istolar · Jul 24, 2020 · b334ec4 · b334ec4
1 parent abe9994
commit b334ec4
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 34 deletions.
diff --git a/modules/openideal_idea/openideal_idea.module b/modules/openideal_idea/openideal_idea.module
@@ -16,7 +16,6 @@ use Drupal\Core\Url;
 use Drupal\node\NodeInterface;
 use Drupal\openideal_idea\ComputedNumberList;
 use Drupal\openideal_idea\Form\OpenidealBaseRatingForm;
-use Drupal\openideal_idea\Plugin\OpenidealGroupContentAccessControlHandler as GroupContentAccessHandle;
 
 /**
  * Implements hook_theme().
@@ -287,9 +286,12 @@ function openideal_idea_entity_type_build(array &$entity_types) {
 }
 
 /**
- * Implements hook_group_content_info_alter().
+ * Implements hook_ENTITY_TYPE_access().
  */
-function openideal_idea_group_content_info_alter(&$info) {
-  // Alter the content enabler plugin definitions to use our class.
-  $info['group_membership']['handlers']['access'] = GroupContentAccessHandle::class;
+function openideal_idea_group_content_access(EntityInterface $entity, $operation, AccountInterface $account) {
+  if ($entity->getOwnerId() === $account->id()
+    && $operation == 'delete'
+    && $entity->getContentPlugin()->getPluginId() == 'group_membership') {
+    return AccessResult::forbidden();
+  }
 }
diff --git a/modules/openideal_idea/src/Plugin/OpenidealGroupContentAccessControlHandler.php b/modules/openideal_idea/src/Plugin/OpenidealGroupContentAccessControlHandler.php