Skip to content

Fixed use of route params during background process. #54

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
zerocrates merged 1 commit into from
Nov 15, 2024
Merged

Fixed use of route params during background process. #54

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
17 changes: 8 additions & 9 deletions Module.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -163,14 +163,15 @@ public function repValueHtml($event)

$propertyId = $target->property()->id();

$routeMatch = $this->getServiceLocator()->get('Application')
->getMvcEvent()->getRouteMatch();
$routeMatchParams = $routeMatch->getParams();
/** @var \Omeka\Mvc\Status $status */
$services = $this->getServiceLocator();
$status = $services->get('Omeka\Status');

//setup the route params to pass to the Url helper. Both the route name and its parameters go here
$routeParams = [
'action' => 'browse',
'action' => 'browse',
];
if ($routeMatch->getParam('__ADMIN__')) {
if ($status->isAdminRequest()) {
$globalSettings = $this->getServiceLocator()->get('Omeka\Settings');
if ($globalSettings->get('metadata_browse_use_globals')) {
$filteredPropertyIds = $globalSettings->get('metadata_browse_properties', []);
Expand All @@ -185,12 +186,11 @@ public function repValueHtml($event)
$filteredPropertyIds = array_merge($currentSettings, $filteredPropertyIds);
}
}

$routeParams['route'] = 'admin/default';
} elseif ($routeMatch->getParam('__SITE__')) {
} elseif ($status->isSiteRequest()) {
$siteSettings = $this->getServiceLocator()->get('Omeka\Settings\Site');
$filteredPropertyIds = $siteSettings->get('metadata_browse_properties', []);
$siteSlug = $routeMatch->getParam('site-slug');
$siteSlug = $status->getRouteParam('site-slug');
$routeParams['route'] = 'site';
$routeParams['site-slug'] = $siteSlug . '/' . $controllerName;
} else {
Expand All @@ -201,7 +201,6 @@ public function repValueHtml($event)
$url = $viewHelperManager->get('Url');
$hyperlink = $viewHelperManager->get('hyperlink');
if (in_array($propertyId, $filteredPropertyIds)) {
$controllerName = $controllerName;
$routeParams['controller'] = $controllerName;

$translator = $this->getServiceLocator()->get('MvcTranslator');
Expand Down