Merge pull request #1277 from tomudding/fix/broken-company-package-fo…

…rms-for-non-localisable-variant Fix package forms not validating due to localisable dependency
GEWIS · Nov 17, 2021 · d7621a3 · d7621a3
2 parents 9b63263 + c11286f
commit d7621a3
Show file tree

Hide file tree

Showing 2 changed files with 26 additions and 25 deletions.
diff --git a/module/Application/src/Form/Localisable.php b/module/Application/src/Form/Localisable.php
@@ -17,35 +17,36 @@ abstract class Localisable extends Form implements InputFilterProviderInterface
      */
     private Translator $translator;
 
-    public function __construct(Translator $translator)
+    public function __construct(Translator $translator, bool $addElements = true)
     {
         parent::__construct();
-
         $this->translator = $translator;
 
-        $this->add(
-            [
-                'name' => 'language_dutch',
-                'type' => Checkbox::class,
-                'options' => [
-                    'label' => $this->getTranslator()->translate('Enable Dutch Translations'),
-                    'checked_value' => '1',
-                    'unchecked_value' => '0',
-                ],
-            ]
-        );
+        if ($addElements) {
+            $this->add(
+                [
+                    'name' => 'language_dutch',
+                    'type' => Checkbox::class,
+                    'options' => [
+                        'label' => $this->getTranslator()->translate('Enable Dutch Translations'),
+                        'checked_value' => '1',
+                        'unchecked_value' => '0',
+                    ],
+                ]
+            );
 
-        $this->add(
-            [
-                'name' => 'language_english',
-                'type' => Checkbox::class,
-                'options' => [
-                    'label' => $this->getTranslator()->translate('Enable English Translations'),
-                    'checked_value' => '1',
-                    'unchecked_value' => '0',
-                ],
-            ]
-        );
+            $this->add(
+                [
+                    'name' => 'language_english',
+                    'type' => Checkbox::class,
+                    'options' => [
+                        'label' => $this->getTranslator()->translate('Enable English Translations'),
+                        'checked_value' => '1',
+                        'unchecked_value' => '0',
+                    ],
+                ]
+            );
+        }
     }
 
     /**

diff --git a/module/Company/src/Form/Package.php b/module/Company/src/Form/Package.php
@@ -28,7 +28,7 @@ class Package extends LocalisableForm implements InputFilterProviderInterface
 
     public function __construct(Translator $translator, string $type)
     {
-        parent::__construct($translator);
+        parent::__construct($translator, ('featured' === $type));
         $this->type = $type;
         $this->setAttribute('method', 'post');