fix ticket-0736

g5bot · Huxinator · commit 2af45c4b897a · 2025-04-23T12:04:45.000+02:00
diff --git a/src/Module/Colony/Lib/Gui/ColonyGuiHelper.php b/src/Module/Colony/Lib/Gui/ColonyGuiHelper.php
@@ -9,7 +9,6 @@
 use Stu\Lib\Colony\PlanetFieldHostInterface;
 use Stu\Lib\Component\ComponentRegistrationInterface;
 use Stu\Module\Control\GameControllerInterface;
-use Stu\Orm\Entity\ColonyInterface;
 use Stu\Orm\Entity\ColonySandboxInterface;
 
 final class ColonyGuiHelper implements ColonyGuiHelperInterface
@@ -30,13 +29,10 @@ public function registerMenuComponents(
         $game->setTemplateVar('HOST', $host);
         $game->setTemplateVar('CURRENT_MENU', $menu);
 
-        if ($host instanceof ColonyInterface) {
-            $game->setTemplateVar('COLONY', $host);
-            $game->setTemplateVar('FORM_ACTION', 'colony.php');
-        }
         if ($host instanceof ColonySandboxInterface) {
             $game->setTemplateVar('COLONY', $host->getColony());
-            $game->setTemplateVar('FORM_ACTION', '/admin/index.php');
+        } else {
+            $game->setTemplateVar('COLONY', $host);
         }
     }
 
diff --git a/src/Module/Colony/View/ShowField/ShowField.php b/src/Module/Colony/View/ShowField/ShowField.php
@@ -67,7 +67,6 @@ public function handle(GameControllerInterface $game): void
 
         if ($host instanceof ColonyInterface) {
             $game->setTemplateVar('COLONY', $host);
-            $game->setTemplateVar('FORM_ACTION', 'colony.php');
             $game->setTemplateVar('SHIP_BUILD_PROGRESS', $this->colonyShipQueueRepository->getByColonyAndMode($host->getId(), 1));
             $game->setTemplateVar('SHIP_RETROFIT_PROGRESS', $this->colonyShipQueueRepository->getByColonyAndMode($host->getId(), 2));
 
@@ -104,11 +103,8 @@ public function handle(GameControllerInterface $game): void
                 'TERRAFORMING_STATE',
                 $terraFormingState
             );
-        } else {
-            $game->setTemplateVar('FORM_ACTION', '/admin/index.php');
         }
 
-
         $game->setPageTitle(sprintf('Feld %d - Informationen', $field->getFieldId()));
         $game->setMacroInAjaxWindow('html/colony/component/fieldAction.twig');
 
@@ -154,4 +150,4 @@ private function getConstructionStatusBar(PlanetFieldInterface $field, BuildingI
             ->setValue($field->getBuildProgress())
             ->render();
     }
-}
+}
diff --git a/src/html/colony/menu/formContainer.twig b/src/html/colony/menu/formContainer.twig
@@ -1,5 +1,5 @@
 <div>
-    <form action="{{ FORM_ACTION }}" method="post">
+    <form action="colony.php" method="post">
         {% block containment %}
         ...
         {% endblock %}
diff --git a/src/html/colony/menu/submenuForm.twig b/src/html/colony/menu/submenuForm.twig
@@ -1,4 +1,4 @@
-<form action="{{ FORM_ACTION }}" method="post">
+<form action="colony.php" method="post">
     <input type="hidden" name="id" value="{{ HOST.getId }}" />
     <input type="hidden" name="hosttype" value="{{ HOST.getHostType.value }}" />
     <input type="hidden" name="sstr" value="{{ SESSIONSTRING }}" />
diff --git a/src/html/spacecraft/waste.twig b/src/html/spacecraft/waste.twig
@@ -1,4 +1,4 @@
-<form action="{{ FORM_ACTION }}" method="post">
+<form action="colony.php" method="post">
     <input type="hidden" name="id" value="{{ SPACECRAFT.getId }}" />
     <input type="hidden" name="sstr" value="{{ SESSIONSTRING }}" />
     {% block containment %}
@@ -40,4 +40,4 @@
         </table>
     </div>
     {% endblock %}
-</form>
+</form>
diff --git a/tests/inttest/html/__snapshots__/AllViewControllerTest--COLONY_VIEWS-SHOW_MODULEFAB.html b/tests/inttest/html/__snapshots__/AllViewControllerTest--COLONY_VIEWS-SHOW_MODULEFAB.html
@@ -1,7 +1,7 @@
 <!DOCTYPE html>
 <html lang="de" xmlns:stu="stu">
 <body>
-<form action="" method="post">
+<form action="colony.php" method="post">
     <input type="hidden" name="id" value="42">
     <input type="hidden" name="hosttype" value="1">
     <input type="hidden" name="sstr" value="MOCKED_SESSIONSTRING">

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-<form action="{{ FORM_ACTION }}" method="post">`
	`1`	`+<form action="colony.php" method="post">`
`2`	`2`	`<input type="hidden" name="id" value="{{ HOST.getId }}" />`
`3`	`3`	`<input type="hidden" name="hosttype" value="{{ HOST.getHostType.value }}" />`
`4`	`4`	`<input type="hidden" name="sstr" value="{{ SESSIONSTRING }}" />`