Commit 915875cf authored by Markus Hoelzle's avatar Markus Hoelzle Committed by Christian Kuhn
Browse files

[BUGFIX] Fix configuration of distribution packages

Fix link to configuration of distribution packages
and redirect after saving this confiuration.

Releases: master,8.7
Resolves: #82376
Change-Id: I7f054a32187260e102b30c097937d5348ec121a6
Reviewed-on: https://review.typo3.org/54005

Tested-by: default avatarTYPO3com <no-reply@typo3.com>
Reviewed-by: Anja Leichsenring's avatarAnja Leichsenring <aleichsenring@ab-softlab.de>
Tested-by: Anja Leichsenring's avatarAnja Leichsenring <aleichsenring@ab-softlab.de>
Reviewed-by: Christian Kuhn's avatarChristian Kuhn <lolli@schwarzbu.ch>
Tested-by: Christian Kuhn's avatarChristian Kuhn <lolli@schwarzbu.ch>
parent 64c3d8ab
......@@ -88,19 +88,13 @@ class ConfigurationController extends AbstractModuleController
->assign('configuration', $configuration)
->assign('extension', $extension);
} else {
/** @var Extension $extension */
$extension = $this->extensionRepository->findOneByCurrentVersionByExtensionKey($extKey);
// Extension has no configuration and is a distribution
if ($extension->getCategory() === Extension::DISTRIBUTION_CATEGORY) {
$this->redirect('welcome', 'Distribution', null, ['extension' => $extension->getUid()]);
}
throw new ExtensionManagerException('The extension ' . $extKey . ' has no configuration.', 1476047775);
}
}
/**
* Save configuration and redirects back to form
* or to the welcome page of a distribution
* or to the show page of a distribution
*
* @param array $config The new extension configuration
* @param string $extensionKey The extension key
......@@ -114,7 +108,7 @@ class ConfigurationController extends AbstractModuleController
if ($extension instanceof Extension &&
$extension->getCategory() === Extension::DISTRIBUTION_CATEGORY
) {
$this->redirect('welcome', 'Distribution', null, ['extension' => $extension->getUid()]);
$this->redirect('show', 'Distribution', null, ['extension' => $extension->getUid()]);
} else {
$this->redirect('showConfigurationForm', null, null, [
'extension' => [
......
......@@ -33,7 +33,7 @@
<f:then>
<f:if condition="{configurationLink}">
<li>
<a href="{configurationLink}" class="btn btn-default distribution-openViewModule " onclick="top.goToModule('web_ViewpageView');">
<a href="{configurationLink}" class="btn btn-default">
<core:icon identifier="actions-system-extension-configure" /><f:translate key="extensionList.configure" />
</a>
</li>
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment