portal dev

This commit is contained in:
yuri
2016-01-15 14:41:58 +02:00
parent 6dc13f229e
commit ef5fec4282
25 changed files with 219 additions and 48 deletions

View File

@@ -50,6 +50,12 @@ class Settings extends \Espo\Core\Controllers\Base
foreach ($this->getContainer()->get('portal')->getSettingsAttributeList() as $attribute) {
$data[$attribute] = $this->getContainer()->get('portal')->get($attribute);
}
if (empty($data['language'])) {
$data['language'] = $this->getConfig()->get('language');
}
if (empty($data['theme'])) {
$data['theme'] = $this->getConfig()->get('theme');
}
}
return $data;
}