diff --git a/application/controllers/CisHmvc/Cms.php b/application/controllers/CisHmvc/Cms.php
index e01313521..d8bb3a3db 100755
--- a/application/controllers/CisHmvc/Cms.php
+++ b/application/controllers/CisHmvc/Cms.php
@@ -110,7 +110,7 @@ class Cms extends Auth_Controller
*/
public function news($infoscreen = false, $studiengang_kz = null, $semester = null, $mischen = true, $titel = '', $edit = false, $sichtbar = true)
{
- $this->load->view('CisHtml/Cms/Content', ['infoscreen' => $infoscreen, 'studiengang_kz' => $studiengang_kz, 'semester' => $semester, 'mischen' => $mischen, 'titel' => $titel, 'edit' => $edit, 'sichtbar' => $sichtbar]);
+ $this->load->view('CisHtml/Cms/Content', ['infoscreen' => $infoscreen, 'studiengang_kz' => $studiengang_kz, 'semester' => $semester, 'mischen' => $mischen, 'titel' => $titel, 'edit' => $edit, 'sichtbar' => $sichtbar, "template_kurzbz"=>"news"]);
}
public function getNews($infoscreen = false, $studiengang_kz = null, $semester = null, $mischen = true, $titel = '', $edit = false, $sichtbar = true)
diff --git a/application/controllers/CisHtml/Cms.php b/application/controllers/CisHtml/Cms.php
index 6cb43c8bc..40126925c 100755
--- a/application/controllers/CisHtml/Cms.php
+++ b/application/controllers/CisHtml/Cms.php
@@ -75,7 +75,7 @@ class Cms extends FHC_Controller
*/
public function news($infoscreen = false, $studiengang_kz = null, $semester = null, $mischen = true, $titel = '', $edit = false, $sichtbar = true)
{
- $this->load->view('CisHtml/Cms/Content', ['infoscreen' => $infoscreen, 'studiengang_kz' => $studiengang_kz, 'semester' => $semester, 'mischen' => $mischen, 'titel' => $titel, 'edit' => $edit, 'sichtbar' => $sichtbar]);
+ $this->load->view('CisHtml/Cms/Content', ['infoscreen' => $infoscreen, 'studiengang_kz' => $studiengang_kz, 'semester' => $semester, 'mischen' => $mischen, 'titel' => $titel, 'edit' => $edit, 'sichtbar' => $sichtbar, "template_kurzbz"=>"news"]);
}
public function getNews($infoscreen = false, $studiengang_kz = null, $semester = null, $mischen = true, $titel = '', $edit = false, $sichtbar = true)
diff --git a/application/controllers/CisVue/Cms.php b/application/controllers/CisVue/Cms.php
index d41dfc3db..f4ce98e89 100755
--- a/application/controllers/CisVue/Cms.php
+++ b/application/controllers/CisVue/Cms.php
@@ -84,7 +84,7 @@ class Cms extends FHC_Controller
*/
public function news($infoscreen = false, $studiengang_kz = null, $semester = null, $mischen = true, $titel = '', $edit = false, $sichtbar = true)
{
- $this->load->view('CisHtml/Cms/Content', ['infoscreen' => $infoscreen, 'studiengang_kz' => $studiengang_kz, 'semester' => $semester, 'mischen' => $mischen, 'titel' => $titel, 'edit' => $edit, 'sichtbar' => $sichtbar]);
+ $this->load->view('CisHtml/Cms/Content', ['infoscreen' => $infoscreen, 'studiengang_kz' => $studiengang_kz, 'semester' => $semester, 'mischen' => $mischen, 'titel' => $titel, 'edit' => $edit, 'sichtbar' => $sichtbar, "template_kurzbz"=>"news"]);
}
public function getNews($infoscreen = false, $studiengang_kz = null, $semester = null, $mischen = true, $titel = '', $edit = false, $sichtbar = true)
diff --git a/public/js/components/Cis/Cms/Content.js b/public/js/components/Cis/Cms/Content.js
index f724d13c7..53689f162 100644
--- a/public/js/components/Cis/Cms/Content.js
+++ b/public/js/components/Cis/Cms/Content.js
@@ -1,5 +1,5 @@
import raum_contentmittitel from './Content_types/Raum_contentmittitel.js'
-import news from './Content_types/News.js'
+import general from './Content_types/General.js'
export default {
@@ -25,6 +25,7 @@ export default {
},
components:{
raum_contentmittitel,
+ general,
},
data() {
return {
@@ -32,10 +33,21 @@ export default {
};
},
+ computed:{
+ computeContentType: function(){
+ switch(this.content_type){
+
+ case "raum_contentmittitel":
+ return "raum_contentmittitel";
+ default:
+ return "general";
+ };
+ },
+ },
created() {
this.$fhcApi.factory.cms.content(this.content_id,this.version, this.sprache, this.sichtbar).then(res =>{
this.content = res.data.content;
- this.content_type=res.data.content;
+ this.content_type=res.data.type;
});
},
mounted(){
@@ -43,7 +55,7 @@ export default {
},
template: /*html*/ `
-
No content is available to display
`, diff --git a/public/js/components/Cis/Cms/Content_types/News.js b/public/js/components/Cis/Cms/Content_types/General.js similarity index 100% rename from public/js/components/Cis/Cms/Content_types/News.js rename to public/js/components/Cis/Cms/Content_types/General.js