Resolve "Forum: Bearbeiten eines Beitrags fügt jedesmal ein `<div>` hinzu"

Closes #5759

Merge request studip/studip!4396

4 files changed, 13 insertions, 7 deletions

diff --git a/resources/vue/apps/forum/discussions/Show.vue b/resources/vue/apps/forum/discussions/Show.vue
index b0a6f66..7bc1365 100644
--- a/resources/vue/apps/forum/discussions/Show.vue
+++ b/resources/vue/apps/forum/discussions/Show.vue
@@ -134,7 +134,7 @@ onMounted(async () => {
     if (props.search_keyword !== "") {
         highlightText(props.search_keyword, '.post-content');
 
-        document.querySelector('.post-content mark').scrollIntoView();
+        document.querySelector('.post-content mark')?.scrollIntoView();
 
         // remove highlights
         document.getElementById("discussion_start").addEventListener("click", function() {
diff --git a/resources/vue/components/forum/posts/Post.vue b/resources/vue/components/forum/posts/Post.vue
index 523fa51..0cf7af5 100644
--- a/resources/vue/components/forum/posts/Post.vue
+++ b/resources/vue/components/forum/posts/Post.vue
@@ -175,7 +175,7 @@ const removePostHighlight = id => {
                 </template>
                 <template v-else>
                     <div class="post__text">
-                        <PostContent ref="postContent" v-model="selectedText" :content="post.content" class="forum-quote">
+                        <PostContent ref="postContent" v-model="selectedText" :content="post.content_html" class="forum-quote">
                             <template #actions>
                                 <a
                                     :href="`#create_form_${post.id}`"
diff --git a/resources/vue/components/forum/posts/PostContent.vue b/resources/vue/components/forum/posts/PostContent.vue
index 93111f3..84d388e 100644
--- a/resources/vue/components/forum/posts/PostContent.vue
+++ b/resources/vue/components/forum/posts/PostContent.vue
@@ -13,6 +13,7 @@ const props = defineProps({
     }
 });
 
+
 const actionsRef = useTemplateRef('actions');
 
 const onTextSelected = event => {
@@ -57,7 +58,7 @@ watch(() => props.modelValue, newValue => {
 
 <template>
     <div @mouseup="onTextSelected" class="with-ballon-action" v-bind="$attrs">
-        <p class="text-highlight m-0 post-content" v-html="content"></p>
+        <div class="text-highlight m-0 post-content" v-html="content"></div>
 
         <div class="ballon-action" ref="actions">
             <slot name="actions"></slot>
diff --git a/resources/vue/components/forum/posts/PostEditForm.vue b/resources/vue/components/forum/posts/PostEditForm.vue
index 5c9c311..f7ebbe0 100644
--- a/resources/vue/components/forum/posts/PostEditForm.vue
+++ b/resources/vue/components/forum/posts/PostEditForm.vue
@@ -43,15 +43,20 @@ const updatePost = async () => {
         isLoading.value = true;
 
         const response = await STUDIP.jsonapi.withPromises().PATCH(
-            `forum-postings/${props.post.id}?include=author,opengraph-urls,posting,reactions,reactions.user&fields[users]=id`,
+            `forum-postings/${props.post.id}?include=opengraph-urls,posting`,
             { data: getPostJSONAPIObject }
         );
 
-        const post = await deserializeJSONAPIResponse(response)
+        const post = await deserializeJSONAPIResponse(response);
 
-        forumDiscussionPost.updatePost(post);
+        const updatedPost = {
+            ...props.post,
+            ...post
+        };
+
+        forumDiscussionPost.updatePost(updatedPost);
         content.value = "";
-        emit("updated", post);
+        emit("updated", updatedPost);
 
         STUDIP.Report.success($gettext("Die Änderungen wurde gespeichert."));
     } catch (error) {