Merge pull request #152 from AlexanderBlanchardAC/25.01.00_custom_for…

…m_permissions

feat: Add Forms From Additional Admin Locations

code/web/services/WebBuilder/AJAX.php

@@ -64,10 +64,29 @@ function getPortalCellValuesForSource() {
 				if (!UserAccount::userHasPermission('Administer All Custom Forms')) {
 					$libraryCustomForm = new LibraryCustomForm();
 					$userLibrary = Library::getPatronHomeLibrary();
+					$additionalAdminLocations = UserAccount::getActiveUserObj()->getAdditionalAdministrationLocations();
+
+					$validLibraryIds = [];
 
 					if ($userLibrary) {
-						$userLibraryId = $userLibrary->libraryId;
-						$libraryCustomForm->whereAdd('libraryId = ' . $userLibraryId);
+						$validLibraryIds[] = $userLibrary->libraryId;
+					}
+
+
+					if (!empty($additionalAdminLocations)) {
+						foreach ($additionalAdminLocations as $locationId => $locationName) {
+							$library = Library::getLibraryForLocation($locationId);
+							if ($library) {
+								$validLibraryIds[] = $library->libraryId;
+							}
+						}
+					}
+
+
+					if (count($validLibraryIds) > 0) {
+
+						$libraryCustomForm->whereAddIn('libraryId', $validLibraryIds, true);
+
 
 						$validCustomForms = [];
 						$libraryCustomForm->find();