From cbbed38d31fb4f4d847b7f43c448a20e075f82e9 Mon Sep 17 00:00:00 2001
From: Jan-Hendrik Willms <tleilax+github@gmail.com>
Date: Mon, 8 Jul 2024 11:08:21 +0200
Subject: [PATCH] fix js errors, re #4367
---
app/controllers/consultation/admin.php | 2 +-
resources/assets/javascripts/bootstrap/vue.js | 1 +
resources/vue/components/ConsultationCreator.vue | 4 ++--
3 files changed, 4 insertions(+), 3 deletions(-)
diff --git a/app/controllers/consultation/admin.php b/app/controllers/consultation/admin.php
index 3d2be46c907..a1f16c549bf 100644
--- a/app/controllers/consultation/admin.php
+++ b/app/controllers/consultation/admin.php
@@ -181,7 +181,7 @@ class Consultation_AdminController extends ConsultationController
'cancel-url' => $this->indexURL(),
'default-room' => $room,
'range-type' => get_class($this->range),
- 'slot-count_threshold' => self::SLOT_COUNT_THRESHOLD,
+ 'slot-count-threshold' => self::SLOT_COUNT_THRESHOLD,
'store-url' => $this->storeURL(),
'with-responsible' => $convertResponsibilities($responsible),
])
diff --git a/resources/assets/javascripts/bootstrap/vue.js b/resources/assets/javascripts/bootstrap/vue.js
index 637241aa009..ce1aa0d5eea 100644
--- a/resources/assets/javascripts/bootstrap/vue.js
+++ b/resources/assets/javascripts/bootstrap/vue.js
@@ -20,6 +20,7 @@ STUDIP.ready(() => {
c.mounted = function (...args) {
if (
this.$el instanceof Element
+ && this.$el.closest('.studip-dialog')
&& this.$el.querySelector('[data-dialog-button]')
) {
this.$el.closest('.studip-dialog')
diff --git a/resources/vue/components/ConsultationCreator.vue b/resources/vue/components/ConsultationCreator.vue
index 487b9b97920..163e23883c2 100644
--- a/resources/vue/components/ConsultationCreator.vue
+++ b/resources/vue/components/ConsultationCreator.vue
@@ -24,7 +24,7 @@
<span class="required">{{ $gettext('Ort') }}</span>
<input required type="text" name="room"
- v-model="room"
+ v-model.trim="room"
:placeholder="$gettext('Ort')">
</label>
@@ -275,7 +275,7 @@
</fieldset>
<footer data-dialog-button>
- <button class="accept button" :disabled="!confirmed">
+ <button class="accept button" :disabled="room.length === 0 || !confirmed">
{{ $gettext('Termin speichern') }}
</button>
<a :href="cancelUrl" class="cancel button" @click="evt => closeCreator(evt)">
--
GitLab