[BUGFIX] Fix configuration of distribution packages 05/54005/3
authorMarkus Hoelzle <typo3@markus-hoelzle.de>
Fri, 8 Sep 2017 10:24:34 +0000 (12:24 +0200)
committerChristian Kuhn <lolli@schwarzbu.ch>
Fri, 8 Sep 2017 12:07:54 +0000 (14:07 +0200)
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: TYPO3com <no-reply@typo3.com>
Reviewed-by: Anja Leichsenring <aleichsenring@ab-softlab.de>
Tested-by: Anja Leichsenring <aleichsenring@ab-softlab.de>
Reviewed-by: Christian Kuhn <lolli@schwarzbu.ch>
Tested-by: Christian Kuhn <lolli@schwarzbu.ch>
typo3/sysext/extensionmanager/Classes/Controller/ConfigurationController.php
typo3/sysext/extensionmanager/Resources/Private/Templates/Distribution/Show.html

index e1215ce..495c5d8 100644 (file)
@@ -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' => [
index 45cb884..c0fe1d8 100644 (file)
@@ -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>