ref
This commit is contained in:
@@ -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;
|
||||
|
||||
@@ -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
|
||||
|
||||
Reference in New Issue
Block a user