diff --git a/app/views/admin/sem_classes/add_sem_type.php b/app/views/admin/sem_classes/add_sem_type.php index c842f99c049579f5c2ccac0b55c116466d3251b4..27f18c7b382837e049db3252d47c3f6644e17687 100644 --- a/app/views/admin/sem_classes/add_sem_type.php +++ b/app/views/admin/sem_classes/add_sem_type.php @@ -1,4 +1,4 @@ -<form action="?" method="post" class="default" id="add_sem_class_window" data-dialog> +<form action="?" method="post" class="default" id="add_sem_class_window"> <fieldset> <legend> <?= _('Veranstaltungskategorie anlegen') ?> diff --git a/lib/classes/SemClass.class.php b/lib/classes/SemClass.class.php index 027d29c19391ebfc8e441124f88177e756cacb2f..5ab5a2d54211ea1681ea433578b3b5f2a63486d0 100644 --- a/lib/classes/SemClass.class.php +++ b/lib/classes/SemClass.class.php @@ -52,7 +52,7 @@ class SemClass implements ArrayAccess static public function getDefaultSemClass() { $data = [ 'name' => "Fehlerhafte Seminarklasse!", - 'modules' => '{"CoreOverview":{"activated":1,"sticky":1},"CoreAdmin":{"activated":1,"sticky":1}, "CoreResources":{"activated":1,"sticky":0}}', + 'modules' => '{"CoreOverview":{"activated":1,"sticky":1},"CoreAdmin":{"activated":1,"sticky":1}}', 'visible' => 1, 'is_group' => false ]; @@ -115,11 +115,21 @@ class SemClass implements ArrayAccess } else { $this->data = $data; } - if ($this->data['modules']) { + if (!empty($this->data['modules'])) { $this->data['modules'] = self::object2array(json_decode($this->data['modules'])); + } else { $this->data['modules'] = []; } + if (!empty($this->data['studygroup_mode'])) { + if (!isset($this->data['modules']['CoreStudygroupAdmin'])) { + $this->data['modules']['CoreStudygroupAdmin'] = ['activated' => 1, 'sticky' => 1]; + } + } else { + if (!isset($this->data['modules']['CoreAdmin'])) { + $this->data['modules']['CoreAdmin'] = ['activated' => 1, 'sticky' => 1]; + } + } foreach (array_keys($this->data['modules']) as $modulename) { if ($this->isModuleForbidden($modulename)) { unset($this->data['modules'][$modulename]); @@ -592,6 +602,7 @@ class SemClass implements ArrayAccess */ static public function refreshClasses() { + StudipCacheFactory::getCache()->expire('DB_SEM_CLASSES_ARRAY'); self::$sem_classes = null; return self::getClasses(); }