bachir
/
materio-d9
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

patched flag_list https://www.drupal.org/project/flag_lists/issues/3230729, patch 2

This commit is contained in:
Bachir Soussi Chiadmi 2021-08-31 23:26:55 +02:00
parent 6ba80af009
commit 0a6dbedf7b
1 changed files with 9 additions and 89 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

98
patches/hook_flag_access_id_on_null.patch
View File

@ -1,93 +1,13 @@
diff --git a/flag_lists.module b/flag_lists.module diff --git a/flag_lists.module b/flag_lists.module
index cd81104..3decec0 100644 index cd81104..1da0c9a 100644
--- a/flag_lists.module --- a/flag_lists.module
+++ b/flag_lists.module +++ b/flag_lists.module
@@ -237,47 +237,49 @@ function flag_lists_flag_action_access($action, FlagInterface $flag, AccountInte @@ -240,7 +240,7 @@ function flag_lists_flag_action_access($action, FlagInterface $flag, AccountInte
// Allow both users flag and the corresponding template. $flagListsService = Drupal::service('flaglists');
// Currently only the users flag lists are accepted. $flagLists = $flagListsService->getAllFlaggingCollections();
// This needs to corrected to allow also global lists. foreach ($flagLists as $flagList) {
- $flagListsService = Drupal::service('flaglists');
- $flagLists = $flagListsService->getAllFlaggingCollections();
- foreach ($flagLists as $flagList) {
- if ($flag->id() == $flagList->getRelatedFlag()->id()) { - if ($flag->id() == $flagList->getRelatedFlag()->id()) {
- if ($flagList->getBaseFlag()->isGlobal()) { + if ($flagList->getRelatedFlag() && $flag->id() == $flagList->getRelatedFlag()->id()) {
- // The flag list is global. if ($flagList->getBaseFlag()->isGlobal()) {
- return AccessResult::allowedIfHasPermission($account, // The flag list is global.
- 'access global flag lists'); return AccessResult::allowedIfHasPermission($account,
- }
- elseif ($flagList->getOwnerId() == $account->id()) {
- // The flag list is owned by current user.
- return AccessResult::allowedIfHasPermission($account,
- 'view own flag lists');
- }
- else {
- // The user is allowed to see all flag lists.
- return AccessResult::allowedIfHasPermission($account,
- 'view flag lists');
+ if ($flag){
+ $flagListsService = Drupal::service('flaglists');
+ $flagLists = $flagListsService->getAllFlaggingCollections();
+ foreach ($flagLists as $flagList) {
+ if ($flag->id() == $flagList->getRelatedFlag()->id()) {
+ if ($flagList->getBaseFlag()->isGlobal()) {
+ // The flag list is global.
+ return AccessResult::allowedIfHasPermission($account,
+ 'access global flag lists');
+ }
+ elseif ($flagList->getOwnerId() == $account->id()) {
+ // The flag list is owned by current user.
+ return AccessResult::allowedIfHasPermission($account,
+ 'view own flag lists');
+ }
+ else {
+ // The user is allowed to see all flag lists.
+ return AccessResult::allowedIfHasPermission($account,
+ 'view flag lists');
+ }
}
}
- }
-
- // Check for access for the used template as well.
- $flagTemplates = $flagListsService->getAllFlagForList();
- foreach ($flagTemplates as $flagTemplate) {
- if ($flag->id() == $flagTemplate->id()) {
- // This is one of the template flags.
- // But is it global?
- $baseFlag = Drupal::service('flag')->getFlagById($flagTemplate->getBaseFlag());
- if ($baseFlag->isGlobal()) {
- return AccessResult::allowedIfHasPermission($account,
- 'access global flag lists');
- }
- else {
- return AccessResult::allowedIfHasPermissions($account, [
- 'administer flag lists',
- 'view own flag lists',
- 'view flag lists',
- ],
- 'OR'
- );
+
+ // Check for access for the used template as well.
+ $flagTemplates = $flagListsService->getAllFlagForList();
+ foreach ($flagTemplates as $flagTemplate) {
+ if ($flag->id() == $flagTemplate->id()) {
+ // This is one of the template flags.
+ // But is it global?
+ $baseFlag = Drupal::service('flag')->getFlagById($flagTemplate->getBaseFlag());
+ if ($baseFlag->isGlobal()) {
+ return AccessResult::allowedIfHasPermission($account,
+ 'access global flag lists');
+ }
+ else {
+ return AccessResult::allowedIfHasPermissions($account, [
+ 'administer flag lists',
+ 'view own flag lists',
+ 'view flag lists',
+ ],
+ 'OR'
+ );
+ }
}
}
}