Merge pull request #1194 from CatoTH/v4-release-bugfixes

V4 release bugfixes

Author: CatoTH

composer.lock

@@ -44,6 +44,7 @@ cd local/antragsgruen-$ANTRAGSGRUEN_VERSION
 curl -sS https://getcomposer.org/installer | php
 ./composer.phar install --no-dev
 
+./docs/create-static-resources.php v$ANTRAGSGRUEN_VERSION
 ./docs/create-dist-clean-repository.sh
 
 mkdir plugins runtime
@@ -58,8 +59,6 @@ cp config/.htaccess vendor/
 sed -i -e 's/repository\-source/dist/g' config/defines.php
 rm -f config/defines.php-e
 
-docs/create-static-resources.php v$ANTRAGSGRUEN_VERSION
-
 cd ..
 mv antragsgruen-$ANTRAGSGRUEN_VERSION/local/cdn/v$ANTRAGSGRUEN_VERSION ../dist/antragsgruen-$ANTRAGSGRUEN_VERSION-cdn
 rmdir antragsgruen-$ANTRAGSGRUEN_VERSION/local/cdn

docs/create-dist.sh

@@ -92,18 +92,22 @@ function copyWithDirectory(SplFileInfo $from, string $to): void {
     }
 }
 
-$files = new RecursiveIteratorIterator(
-    new RecursiveDirectoryIterator($localPluginDir, RecursiveDirectoryIterator::SKIP_DOTS)
-);
-foreach ($files as $file) {
-    /** @var SplFileInfo $file */
-    if (isPluginRelevantForCDN($file)) {
-        if (preg_match('/plugins\/(?<plugin>[a-z0-9_-]+)\/assets\/(?<filename>[a-z0-9_.\/-]+)$/siU', $file->getRealPath(), $matches)) {
-            copyWithDirectory($file, $cdnDir . "/plugins/" . $matches['plugin'] . "/" . $matches['filename']);
-        } else {
-            echo "Skipping Plugin Asset: " . $file->getRealPath() . "\n";
+if (file_exists($localPluginDir)) {
+    $files = new RecursiveIteratorIterator(
+        new RecursiveDirectoryIterator($localPluginDir, RecursiveDirectoryIterator::SKIP_DOTS)
+    );
+    foreach ($files as $file) {
+        /** @var SplFileInfo $file */
+        if (isPluginRelevantForCDN($file)) {
+            if (preg_match('/plugins\/(?<plugin>[a-z0-9_-]+)\/assets\/(?<filename>[a-z0-9_.\/-]+)$/siU', $file->getRealPath(), $matches)) {
+                copyWithDirectory($file, $cdnDir . "/plugins/" . $matches['plugin'] . "/" . $matches['filename']);
+            } else {
+                echo "Skipping Plugin Asset: " . $file->getRealPath() . "\n";
+            }
         }
     }
+} else {
+    echo "Skipping Plugins\n";
 }
 
 // --- Pass 1: collect integrity hashes and direct imports ---

docs/create-static-resources.php

@@ -25,7 +25,6 @@ export class ConsultationCreate {
 
     settingsTypeChanged() {
         if (document.getElementById('settingsTypeWizard').checked) {
-            console.log("checked");
             document.querySelector('.settingsTypeWizard').classList.remove('hidden');
             document.querySelectorAll('.settingsTypeTemplate').forEach(el => el.classList.add('hidden'));
             document.querySelector('.templateSubselect').classList.add('hidden');

pnpm-lock.yaml

@@ -262,7 +262,8 @@ export class SiteCreateWizard {
         $form.find(".radio-label input").on("change", function () {
             const $fieldset = $(this).parents("fieldset").first();
             $fieldset.find(".radio-label").removeClass("active");
-            $(this).parents(".radio-label").first().addClass("active");
+            const $active = $fieldset.find(".radio-label input:checked");
+            $active.parents(".radio-label").first().addClass("active");
         }).trigger("change");
         $form.find(".checkbox-label input").on("change", function () {
             const $this = $(this);

web/js/modules/backend/ConsultationCreate.js

@@ -217,10 +217,12 @@ export function getSpeechCommonMixins() {
                     this.showApplicationForm += '_poo';
                 }
                 this.$nextTick(function () {
-                    if (this.$refs.adderNameInput) {
-                        this.$refs.adderNameInput[0].focus();
-                    } else if (this.$refs.adderNameInput) {
+                    if (this.$refs.adderNameInput instanceof HTMLInputElement) {
+                        // Single Queue
                         this.$refs.adderNameInput.focus();
+                    } else {
+                        // Multiple Queues
+                        this.$refs.adderNameInput[0].focus();
                     }
                 });
             },