Skip to content
Snippets Groups Projects
Commit 45abc7d8 authored by André Noack's avatar André Noack
Browse files

fix new semclass entries closes #1290

Closes #1290

Merge request studip/studip!808
parent 76a830ac
No related branches found
No related tags found
No related merge requests found
<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> <fieldset>
<legend> <legend>
<?= _('Veranstaltungskategorie anlegen') ?> <?= _('Veranstaltungskategorie anlegen') ?>
......
...@@ -52,7 +52,7 @@ class SemClass implements ArrayAccess ...@@ -52,7 +52,7 @@ class SemClass implements ArrayAccess
static public function getDefaultSemClass() { static public function getDefaultSemClass() {
$data = [ $data = [
'name' => "Fehlerhafte Seminarklasse!", '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, 'visible' => 1,
'is_group' => false 'is_group' => false
]; ];
...@@ -115,11 +115,21 @@ class SemClass implements ArrayAccess ...@@ -115,11 +115,21 @@ class SemClass implements ArrayAccess
} else { } else {
$this->data = $data; $this->data = $data;
} }
if ($this->data['modules']) { if (!empty($this->data['modules'])) {
$this->data['modules'] = self::object2array(json_decode($this->data['modules'])); $this->data['modules'] = self::object2array(json_decode($this->data['modules']));
} else { } else {
$this->data['modules'] = []; $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) { foreach (array_keys($this->data['modules']) as $modulename) {
if ($this->isModuleForbidden($modulename)) { if ($this->isModuleForbidden($modulename)) {
unset($this->data['modules'][$modulename]); unset($this->data['modules'][$modulename]);
...@@ -592,6 +602,7 @@ class SemClass implements ArrayAccess ...@@ -592,6 +602,7 @@ class SemClass implements ArrayAccess
*/ */
static public function refreshClasses() static public function refreshClasses()
{ {
StudipCacheFactory::getCache()->expire('DB_SEM_CLASSES_ARRAY');
self::$sem_classes = null; self::$sem_classes = null;
return self::getClasses(); return self::getClasses();
} }
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment