From ebb9efc0ce48472635dcf1010fd6791e9df7f945 Mon Sep 17 00:00:00 2001
From: Eric Bremner <ebremner@uwaterloo.ca>
Date: Thu, 20 Mar 2025 12:20:45 -0400
Subject: [PATCH] ISTWCMS-7252: Fix the user access check for the forms
---
src/Service/UwCustomFormsService.php | 26 ++++++++++++++++++--------
1 file changed, 18 insertions(+), 8 deletions(-)
diff --git a/src/Service/UwCustomFormsService.php b/src/Service/UwCustomFormsService.php
index b5aeebd..3b08a16 100644
--- a/src/Service/UwCustomFormsService.php
+++ b/src/Service/UwCustomFormsService.php
@@ -348,14 +348,24 @@ class UwCustomFormsService {
// Get the forms from the config.
$forms = $this->configFactory->getEditable('uw_custom_forms.settings')->get('allowed_forms');
- foreach ($forms as $form) {
- if ($form) {
- $user = $this->entityTypeManager
- ->getStorage('user')
- ->load($this->currentUser->id());
-
- if ($this->checkUserAccess($user, $form) instanceof AccessResultAllowed) {
- $allowed_forms[] = $form;
+ // If there are forms, then get the info.
+ if ($forms) {
+
+ // Step through each of the forms, and get the info.
+ foreach ($forms as $form) {
+
+ // If there is a form, get its info.
+ if ($form) {
+
+ // Get the user.
+ $user = $this->entityTypeManager
+ ->getStorage('user')
+ ->load($this->currentUser->id());
+
+ // If the user has access, then add it to the array.
+ if ($this->checkUserAccess($user, $form) instanceof AccessResultAllowed) {
+ $allowed_forms[] = $form;
+ }
}
}
}
--
GitLab