Skip to content
Snippets Groups Projects
Commit 36239bf7 authored by Elmar Ludwig's avatar Elmar Ludwig
Browse files

use persistent datafield order stored in the config, fixes #3380

Closes #3380

Merge request studip/studip!2300
parent 30adef10
No related branches found
No related tags found
No related merge requests found
...@@ -401,7 +401,7 @@ class ExternModuleTemplateLecturedetails extends ExternModule { ...@@ -401,7 +401,7 @@ class ExternModuleTemplateLecturedetails extends ExternModule {
$content['LECTUREDETAILS']['STUDIP-DATA'] = $this->getStudipData(); $content['LECTUREDETAILS']['STUDIP-DATA'] = $this->getStudipData();
// generic data fields // generic data fields
if ($generic_datafields = $this->config->getValue('Main', 'genericdatafields')) { if ($generic_datafields = $this->config->getValue('TemplateLectureData', 'genericdatafields')) {
$localEntries = DataFieldEntry::getDataFieldEntries($this->seminar_id, 'sem'); $localEntries = DataFieldEntry::getDataFieldEntries($this->seminar_id, 'sem');
$k = 1; $k = 1;
foreach ($generic_datafields as $datafield) { foreach ($generic_datafields as $datafield) {
......
...@@ -432,7 +432,7 @@ class ExternSemBrowseTemplate extends SemBrowse { ...@@ -432,7 +432,7 @@ class ExternSemBrowseTemplate extends SemBrowse {
} }
// generic datafields // generic datafields
$generic_datafields = $this->module->config->getValue("Main", "genericdatafields"); $generic_datafields = $this->module->config->getValue("TemplateGeneric", "genericdatafields");
$content['__GLOBAL__']['LECTURES-COUNT'] = count($sem_data); $content['__GLOBAL__']['LECTURES-COUNT'] = count($sem_data);
$group_by_name = $this->module->config->getValue("Main", "aliasesgrouping"); $group_by_name = $this->module->config->getValue("Main", "aliasesgrouping");
......
...@@ -348,6 +348,8 @@ class ExternModuleTemplatePersBrowse extends ExternModule { ...@@ -348,6 +348,8 @@ class ExternModuleTemplatePersBrowse extends ExternModule {
$content['PERSONS']['PERSON'][$j]['PERSON-NO'] = $j + 1; $content['PERSONS']['PERSON'][$j]['PERSON-NO'] = $j + 1;
// generic data fields // generic data fields
$generic_datafields = $this->config->getValue('TemplateListPersons', 'genericdatafields');
if (is_array($generic_datafields)) { if (is_array($generic_datafields)) {
$localEntries = DataFieldEntry::getDataFieldEntries($row['user_id'], 'user'); $localEntries = DataFieldEntry::getDataFieldEntries($row['user_id'], 'user');
$k = 1; $k = 1;
......
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