Skip to content

[BUGFIX] Fix displaying extended search fields #1445

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
sebastian-meyer merged 2 commits into from
Feb 1, 2025
Merged

[BUGFIX] Fix displaying extended search fields #1445

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
9df5224
Fix displaying extended search fields
beatrycze-volk Jan 30, 2025
dc96c5e
Merge branch '5.1.x' into ext-search-5.1
sebastian-meyer Feb 1, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 5 additions & 9 deletions Classes/Controller/SearchController.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -111,6 +111,9 @@ public function mainAction(): void
return;
}

// Get additional fields for extended search.
$this->addExtendedSearch();

// if search was triggered, get search parameters from POST variables
$this->searchParams = $this->getParametersSafely('searchParameter');
// if search was triggered by the ListView plugin, get the parameters from GET variables
Expand Down Expand Up @@ -204,9 +207,6 @@ public function mainAction(): void
$this->addFacetsMenu();
}

// Get additional fields for extended search.
$this->addExtendedSearch();

// Add the current document if present to fluid. This way, we can limit further searches to this document.
if (isset($this->requestData['id'])) {
$currentDocument = $this->documentRepository->findByUid($this->requestData['id']);
Expand Down Expand Up @@ -574,13 +574,9 @@ private function addExtendedSearch(): void

// Get field selector options.
$searchFields = GeneralUtility::trimExplode(',', $this->settings['extendedFields'], true);
$extendedSlotCount = range(0, (int) $this->settings['extendedSlotCount'] - 1);

$slotCountArray = [];
for ($i = 0; $i < $this->settings['extendedSlotCount']; $i++) {
$slotCountArray[] = $i;
}

$this->view->assign('extendedSlotCount', $slotCountArray);
$this->view->assign('extendedSlotCount', $extendedSlotCount);
$this->view->assign('extendedFields', $this->settings['extendedFields']);
$this->view->assign('operators', ['AND', 'OR', 'NOT']);
$this->view->assign('searchFields', $searchFields);
Expand Down