From 99f495f9dd6e279c56282280958793847ddc7b81 Mon Sep 17 00:00:00 2001
From: Jan-Hendrik Willms <tleilax+studip@gmail.com>
Date: Tue, 5 Mar 2024 08:37:22 +0000
Subject: fixes #3649

Closes #3649

Merge request studip/studip!2643
---
 resources/vue/components/I18nTextarea.vue | 24 ++++++++++++++++--------
 templates/forms/range_input.php           |  6 +++---
 2 files changed, 19 insertions(+), 11 deletions(-)

diff --git a/resources/vue/components/I18nTextarea.vue b/resources/vue/components/I18nTextarea.vue
index 1b103b4..5071d38 100644
--- a/resources/vue/components/I18nTextarea.vue
+++ b/resources/vue/components/I18nTextarea.vue
@@ -7,7 +7,7 @@
             <input type=text
                    ref="inputfield"
                    :name="nameOfInput(selectedLanguage.id)"
-                   v-model="values[selectedLanguage.id]"
+                   v-model="currentText"
                    :required="required && defaultLanguage === selectedLanguage.id"
                    v-bind="$attrs"
                    v-on="$listeners"
@@ -16,12 +16,12 @@
                       ref="inputfield"
                       v-bind="$attrs"
                       v-on="$listeners"
-                      v-model="values[selectedLanguage.id]"
+                      v-model="currentText"
                       :required="required && defaultLanguage === selectedLanguage.id"
                       v-else-if="type === 'textarea'"></textarea>
             <studip-wysiwyg :name="nameOfInput(selectedLanguage.id)"
                             ref="inputfield"
-                            v-model="values[selectedLanguage.id]"
+                            v-model="currentText"
                             v-bind="$attrs"
                             v-on="$listeners"
                             :required="required && defaultLanguage === selectedLanguage.id"
@@ -30,7 +30,7 @@
         <input type="hidden"
                v-for="language in otherLanguages"
                :key="`hidden-${language.id}`"
-               v-model="values[language.id]"
+               v-model="currentText"
                :required="required && defaultLanguage === language.id"
                :name="nameOfInput(language.id)">
         <select class="i18n"
@@ -47,21 +47,21 @@
         <input type=text
                ref="inputfield"
                :name="name"
-               v-model="values[selectedLanguage.id]"
+               v-model="currentText"
                v-bind="$attrs"
                v-on="$listeners"
                :required="required"
                v-if="type === 'text'">
         <textarea :name="name"
                   ref="inputfield"
-                  v-model="values[selectedLanguage.id]"
+                  v-model="currentText"
                   v-bind="$attrs"
                   v-on="$listeners"
                   :required="required"
                   v-else-if="type === 'textarea'"></textarea>
         <studip-wysiwyg :name="name"
                         ref="inputfield"
-                        v-model="values[selectedLanguage.id]"
+                        v-model="currentText"
                         v-bind="$attrs"
                         v-on="$listeners"
                         :required="required"
@@ -169,7 +169,15 @@ export default {
         },
         otherLanguages () {
             return this.languages.filter(language => language.id !== this.selectedLanguage.id);
-        }
+        },
+        currentText: {
+            get () {
+                return this.values[this.selectedLanguage.id] ?? '';
+            },
+            set (newValue) {
+                this.values[this.selectedLanguage.id] = newValue;
+            },
+        },
     },
     inheritAttrs: false,
     watch: {
diff --git a/templates/forms/range_input.php b/templates/forms/range_input.php
index 07bd934..502ddde 100644
--- a/templates/forms/range_input.php
+++ b/templates/forms/range_input.php
@@ -10,7 +10,7 @@
              name="<?= htmlReady($name) ?>"
              value="<?= htmlReady($value) ?>"
              id="<?= $id ?>"
-             min="<?= $min ?>"
-             max="<?= $max ?>"
-             step="<?= $step ?>"
+             <? if (isset($min)) printf(':min="%s"', $min); ?>
+             <? if (isset($max)) printf(':max="%s"', $max); ?>
+             <? if (isset($step)) printf(':max="%s"', $step); ?>
     <?= $attributes ?>></range-input>
-- 
cgit v1.0