From 08555a77be0632dc650c14b089bfe9b8cf911eda Mon Sep 17 00:00:00 2001 From: SimonGschnell Date: Fri, 5 Jul 2024 10:00:54 +0200 Subject: [PATCH] makes contentModal bigger for the room content and uses the raum_info component to insert the tabulator in the content --- application/views/CisHmvc/Dashboard.php | 1 + application/views/CisHtml/Dashboard.php | 1 + application/views/CisVue/Dashboard.php | 1 + public/js/components/Cis/Cms/ContentModal.js | 11 +++++++---- 4 files changed, 10 insertions(+), 4 deletions(-) diff --git a/application/views/CisHmvc/Dashboard.php b/application/views/CisHmvc/Dashboard.php index 46d769a38..06da8cd7f 100755 --- a/application/views/CisHmvc/Dashboard.php +++ b/application/views/CisHmvc/Dashboard.php @@ -1,6 +1,7 @@ 'FH-Complete', + 'tabulator5'=>true, 'customJSModules' => ['public/js/apps/Dashboard/Fhc.js'], 'customCSSs' => [ 'public/css/components/dashboard.css' diff --git a/application/views/CisHtml/Dashboard.php b/application/views/CisHtml/Dashboard.php index c2190620d..7948840ad 100755 --- a/application/views/CisHtml/Dashboard.php +++ b/application/views/CisHtml/Dashboard.php @@ -1,6 +1,7 @@ 'Dashboard', + 'tabulator5'=>true, 'customJSModules' => ['public/js/apps/Dashboard/Fhc.js'], 'customCSSs' => [ 'public/css/components/dashboard.css' diff --git a/application/views/CisVue/Dashboard.php b/application/views/CisVue/Dashboard.php index 06c2620cc..10721630e 100755 --- a/application/views/CisVue/Dashboard.php +++ b/application/views/CisVue/Dashboard.php @@ -1,5 +1,6 @@ true, 'customJSModules' => ['public/js/apps/Dashboard/Fhc.js'], 'customCSSs' => [ 'public/css/components/dashboard.css' diff --git a/public/js/components/Cis/Cms/ContentModal.js b/public/js/components/Cis/Cms/ContentModal.js index 0a5903ccc..7a8d9beb8 100644 --- a/public/js/components/Cis/Cms/ContentModal.js +++ b/public/js/components/Cis/Cms/ContentModal.js @@ -1,4 +1,5 @@ import BsModal from "../../Bootstrap/Modal"; +import RaumContent from "./Content_types/Raum_contentmittitel"; export default { @@ -8,6 +9,7 @@ export default { components:{ BsModal, + RaumContent, }, props:{ contentID:{ @@ -36,7 +38,8 @@ export default { if(this.contentID){ this.$fhcApi.factory.cms.content(this.contentID).then(res =>{ - this.content = res.data; + this.content = res.data.content; + this.type = res.data.type; }) } @@ -44,17 +47,17 @@ export default { }, mounted(){ this.modal = this.$refs.modalContainer; - + }, template:/*html*/` - +