Resolve "Forum: Discussion-Type Index auf Vue umsetzen"

Closes #5782

Merge request studip/studip!4406

3 files changed, 11 insertions, 17 deletions

diff --git a/app/controllers/course/forum/discussion_types.php b/app/controllers/course/forum/discussion_types.php
index 68005a5..71a4766 100644
--- a/app/controllers/course/forum/discussion_types.php
+++ b/app/controllers/course/forum/discussion_types.php
@@ -19,14 +19,16 @@ class Course_Forum_DiscussionTypesController extends AuthenticatedController
             _('Neuen Diskussionstyp anlegen'),
             $this->url_for('course/forum/discussion_types/edit'),
             Icon::create('add', Icon::ROLE_CLICKABLE, ['title' => _('Neuen Diskussionstyp anlegen')])
-        )->asDialog('width=700');
+        )->asDialog('width=700;height=650');
 
         Sidebar::Get()->addWidget($actions);
     }
 
     public function index_action()
     {
-        $this->discussion_types = DiscussionType::findBySQL("TRUE ORDER BY mkdate DESC");
+        $this->render_vue_app(
+            Studip\VueApp::create('forum/discussions_types/Index')
+        );
     }
 
     public function edit_action(DiscussionType $discussion_type = null)
@@ -51,10 +53,11 @@ class Course_Forum_DiscussionTypesController extends AuthenticatedController
         }
 
         $this->render_vue_app(
-            Studip\VueApp::create('forum/discussions_types/Edit')->withProps([
-                'icons' => array_unique($icons),
-                'discussion_type' => $discussion_type->toRawArray()
-            ])
+            Studip\VueApp::create('forum/discussions_types/Edit')
+                ->withProps([
+                    'icons' => array_unique($icons),
+                    'discussionType' => $discussion_type->transformData()
+                ])
         );
     }
 
@@ -71,13 +74,4 @@ class Course_Forum_DiscussionTypesController extends AuthenticatedController
 
         $this->relocate('course/forum/discussion_types/index');
     }
-
-    public function delete_action(DiscussionType $discussion_type)
-    {
-        $discussion_type->delete();
-
-        PageLayout::postSuccess(_('Der Diskussionstyp wurde gelöscht.'));
-
-        $this->relocate('course/forum/discussion_types/index');
-    }
 }
diff --git a/app/controllers/course/forum/discussions.php b/app/controllers/course/forum/discussions.php
index e6cec64..4a71519 100644
--- a/app/controllers/course/forum/discussions.php
+++ b/app/controllers/course/forum/discussions.php
@@ -136,7 +136,7 @@ class Course_Forum_DiscussionsController extends Forum\BaseController
 
         $all_tags = array_map(fn(TagDTO $tag) => $tag->toRawArray(), TagDTO::getForumTags());
         $discussion_tags = array_map(fn(TagDTO $tag) => $tag->toRawArray(), $discussion->tags);
-        $discussion_types = array_map(fn(DiscussionType $discussion_type) => $discussion_type->toRawArray(), DiscussionType::getForumDiscussionType());
+        $discussion_types = array_map(fn(DiscussionType $discussion_type) => $discussion_type->toRawArray(), DiscussionType::getAll());
 
         $this->render_vue_app(
             Studip\VueApp::create('forum/discussions/Edit')
diff --git a/app/controllers/course/forum/search.php b/app/controllers/course/forum/search.php
index 706674c..988ca87 100644
--- a/app/controllers/course/forum/search.php
+++ b/app/controllers/course/forum/search.php
@@ -36,7 +36,7 @@ class Course_Forum_SearchController extends Forum\BaseController
         }
 
         $tags = array_map(fn(TagDTO $tag) => $tag->toRawArray(), TagDTO::getForumTags());
-        $discussion_types = array_map(fn(DiscussionType $discussion_type) => $discussion_type->toRawArray(), DiscussionType::getForumDiscussionType());
+        $discussion_types = array_map(fn(DiscussionType $discussion_type) => $discussion_type->toRawArray(), DiscussionType::getAll());
 
         $this->render_vue_app(
             Studip\VueApp::create('forum/search/Index')