routes update; fixed #4517; use controller/action dropdown for route …

…editing
zikula · Feb 15, 2021 · b0f6f3f · b0f6f3f
1 parent 1ad8a6a
commit b0f6f3f
Show file tree

Hide file tree

Showing 32 changed files with 581 additions and 481 deletions.
diff --git a/CHANGELOG-3.1.md b/CHANGELOG-3.1.md
@@ -9,18 +9,19 @@
   - [dependency] The following symfony components are no longer included:
     - amazon-mailer, mailchimp-mailer, mailgun-mailer, postmark-mailer, sendgrid-mailer
   - [CoreBundle] Removed `Zikula\Bundle\CoreBundle\DynamicConfigDumper`.
-  - [ThemeModule] Removed Require.js config (#4558).
+  - [Routes] Controller actions are now named without the old `Action` suffix.
+  - [Theme] Removed Require.js config (#4558).
 
 - Fixes:
   - [composer] Correct Composer 2 compatibilty.
   - [CoreBundle] Added clearing of OPCache (if in use) to standard clearcache operation (#4507).
-  - [MenuModule] Fixed handling of menu items without URI in custom request voter.
-  - [ThemeModule] Asset combination now defaults to `false` on installation (#4419).
-  - [ThemeModule] Corrected missing configurable value for `trimwhitespace` option (#4531).
-  - [ThemeModule] Replaced `robloach/component-installer` with `oomphinc/composer-installers-extender` (#4558).
-  - [UsersModule] Fixed regression when sending mail to more than one user in one step.
-  - [UsersModule] Fixed broken mass deletion (#4597).
-  - [UsersModule] Added redirect for cancel button on registration form (#4595).
+  - [Menu] Fixed handling of menu items without URI in custom request voter.
+  - [Theme] Asset combination now defaults to `false` on installation (#4419).
+  - [Theme] Corrected missing configurable value for `trimwhitespace` option (#4531).
+  - [Theme] Replaced `robloach/component-installer` with `oomphinc/composer-installers-extender` (#4558).
+  - [Users] Fixed regression when sending mail to more than one user in one step.
+  - [Users] Fixed broken mass deletion (#4597).
+  - [Users] Added redirect for cancel button on registration form (#4595).
 
 - Features:
   - [dependency] Changed dependency from `symfony/symfony` to ALL the related `symfony/*` components (#4352, #4563).
@@ -35,7 +36,8 @@
     - This looks the same as ZikulaBootstrapTheme but improves the templates in a way that is not BC.
   - [General] Implemented `Twig\Extension\RuntimeExtensionInterface` for all Twig extensions, allowing them to dynamically load (#4522).
   - [General] Added `addAnnotatedClassesToCompile` method to needed core classes to improve performance when activated.
-  - [ThemeModule] Add `Symfony\WebpackEncoreBundle` (#4571).
+  - [Routes] Dropdown for choosing bundle/controller/action combination (#4517).
+  - [Theme] Add `Symfony\WebpackEncoreBundle` (#4571).
     - Automatically adds webpack assets via a listener.
 
 - Deprecated:

diff --git a/src/system/RoutesModule/Base/AbstractAppSettings.php b/src/system/RoutesModule/Base/AbstractAppSettings.php
@@ -84,47 +84,55 @@ public function getRouteEntriesPerPage(): int
         return $this->routeEntriesPerPage;
     }
 
-    public function setRouteEntriesPerPage(int $routeEntriesPerPage): void
+    public function setRouteEntriesPerPage(int $routeEntriesPerPage): self
     {
         if ((int) $this->routeEntriesPerPage !== $routeEntriesPerPage) {
             $this->routeEntriesPerPage = $routeEntriesPerPage;
         }
+
+        return $this;
     }
 
     public function getShowOnlyOwnEntries(): bool
     {
         return $this->showOnlyOwnEntries;
     }
 
-    public function setShowOnlyOwnEntries(bool $showOnlyOwnEntries): void
+    public function setShowOnlyOwnEntries(bool $showOnlyOwnEntries): self
     {
         if ((bool) $this->showOnlyOwnEntries !== $showOnlyOwnEntries) {
             $this->showOnlyOwnEntries = $showOnlyOwnEntries;
         }
+
+        return $this;
     }
 
     public function getAllowModerationSpecificCreatorForRoute(): bool
     {
         return $this->allowModerationSpecificCreatorForRoute;
     }
 
-    public function setAllowModerationSpecificCreatorForRoute(bool $allowModerationSpecificCreatorForRoute): void
+    public function setAllowModerationSpecificCreatorForRoute(bool $allowModerationSpecificCreatorForRoute): self
     {
         if ((bool) $this->allowModerationSpecificCreatorForRoute !== $allowModerationSpecificCreatorForRoute) {
             $this->allowModerationSpecificCreatorForRoute = $allowModerationSpecificCreatorForRoute;
         }
+
+        return $this;
     }
 
     public function getAllowModerationSpecificCreationDateForRoute(): bool
     {
         return $this->allowModerationSpecificCreationDateForRoute;
     }
 
-    public function setAllowModerationSpecificCreationDateForRoute(bool $allowModerationSpecificCreationDateForRoute): void
+    public function setAllowModerationSpecificCreationDateForRoute(bool $allowModerationSpecificCreationDateForRoute): self
     {
         if ((bool) $this->allowModerationSpecificCreationDateForRoute !== $allowModerationSpecificCreationDateForRoute) {
             $this->allowModerationSpecificCreationDateForRoute = $allowModerationSpecificCreationDateForRoute;
         }
+
+        return $this;
     }
 
     /**

diff --git a/src/system/RoutesModule/Base/bootstrap.php b/src/system/RoutesModule/Base/bootstrap.php
@@ -9,7 +9,7 @@
  *
  * @see https://ziku.la
  *
- * @version Generated by ModuleStudio 1.5.0 (https://modulestudio.de) at Mon Oct 12 13:27:19 CEST 2020.
+ * @version Generated by ModuleStudio 1.5.0 (https://modulestudio.de) at Mon Feb 15 15:13:36 CET 2021.
  */
 
 declare(strict_types=1);

diff --git a/src/system/RoutesModule/Controller/Base/AbstractRouteController.php b/src/system/RoutesModule/Controller/Base/AbstractRouteController.php
@@ -107,15 +107,15 @@ protected function viewInternal(
             new Column('controller'),
             new Column('action'),
             new Column('path'),
-            new Column('host'),
-            new Column('schemes'),
-            new Column('methods'),
+            new Column('description'),
+            new Column('sort'),
             new Column('prependBundlePrefix'),
             new Column('translatable'),
             new Column('translationPrefix'),
+            new Column('schemes'),
+            new Column('methods'),
+            new Column('host'),
             new Column('condition'),
-            new Column('description'),
-            new Column('sort'),
             new Column('createdBy'),
             new Column('createdDate'),
             new Column('updatedBy'),