This commit is contained in:
Yuri Kuznetsov
2022-09-23 14:27:04 +03:00
parent e72f348dc8
commit 8d5cf689ee
2 changed files with 20 additions and 8 deletions
+3 -8
View File
@@ -121,15 +121,10 @@ class Settings
private function getConfigData(): stdClass
{
$data = $this->service->getConfigData();
$metadataData = $this->service->getMetadataConfigData();
$data->jsLibs = $this->metadata->get(['app', 'jsLibs']);
unset($data->loginView);
$loginView = $this->metadata->get(['clientDefs', 'App', 'loginView']);
if ($loginView) {
$data->loginView = $loginView;
foreach (get_object_vars($metadataData) as $key => $value) {
$data->$key = $value;
}
return $data;
+17
View File
@@ -99,6 +99,23 @@ class Settings
return $data;
}
public function getMetadataConfigData(): stdClass
{
$data = (object) [];
$data->jsLibs = $this->metadata->get(['app', 'jsLibs']);
unset($data->loginView);
$loginView = $this->metadata->get(['clientDefs', 'App', 'loginView']);
if ($loginView) {
$data->loginView = $loginView;
}
return $data;
}
/**
* @throws \Espo\Core\Exceptions\BadRequest
* @throws Forbidden