diff --git a/Controller/ApiController.php b/Controller/ApiController.php index 91d7ad3..952a7d1 100644 --- a/Controller/ApiController.php +++ b/Controller/ApiController.php @@ -132,8 +132,6 @@ final class ApiController extends Controller . ((string) $request->getData('type')) . '"' , true); - $response->getHeader()->set('Content-Type', MimeType::M_XLSX, true); - $response->getHeader()->set('Content-Type', MimeType::M_XLSX, true); break; case 'json': @@ -168,8 +166,8 @@ final class ApiController extends Controller if (StringUtils::endsWith($lowerPath, '.lang.php')) { $tcoll['lang'] = $tMedia; - } elseif (StringUtils::endsWith($lowerPath, '.cfg.php')) { - $tcoll['cfg'][$tMedia->getName()] = $tMedia; + } elseif (StringUtils::endsWith($lowerPath, '.cfg.json')) { + $tcoll['cfg'] = $tMedia; } elseif (StringUtils::endsWith($lowerPath, '.xlsx.php') || StringUtils::endsWith($lowerPath, '.xls.php') ) { diff --git a/Controller/BackendController.php b/Controller/BackendController.php index dba8c81..6a17c81 100644 --- a/Controller/BackendController.php +++ b/Controller/BackendController.php @@ -146,6 +146,8 @@ final class BackendController extends Controller if (StringUtils::endsWith($lowerPath, '.lang.php')) { $tcoll['lang'] = $tMedia; + } elseif (StringUtils::endsWith($lowerPath, '.cfg.json')) { + $tcoll['cfg'] = $tMedia; } elseif (StringUtils::endsWith($lowerPath, 'worker.php')) { $tcoll['worker'] = $tMedia; } elseif (StringUtils::endsWith($lowerPath, '.xlsx.php') || StringUtils::endsWith($lowerPath, '.xls.php')) { @@ -197,6 +199,7 @@ final class BackendController extends Controller $view->addData('rcoll', $rcoll); } + $view->addData('unit', $this->app->orgId); $view->addData('tcoll', $tcoll); $view->addData('lang', $request->getData('lang') ?? $request->getHeader()->getL11n()->getLanguage()); $view->addData('template', $template); diff --git a/Theme/Backend/Lang/en.lang.php b/Theme/Backend/Lang/en.lang.php index 058954b..745f6af 100644 --- a/Theme/Backend/Lang/en.lang.php +++ b/Theme/Backend/Lang/en.lang.php @@ -34,6 +34,7 @@ return ['Helper' => [ 'IndividualDB' => 'Individual DB', 'Info' => 'Info', 'Language' => 'Language', + 'Load' => 'Load', 'Media' => 'Media', 'MediaDirectory' => 'Media Directory', 'Modified' => 'Modified', @@ -42,9 +43,11 @@ return ['Helper' => [ 'Other' => 'Other', 'Overview' => 'Overview', 'Permission' => 'Permission', + 'Print' => 'Print', 'Report' => 'Report', 'Reports' => 'Reports', 'Select' => 'Select', + 'Settings' => 'Settings', 'Source' => 'Source', 'Sources' => 'Sources', 'Standalone' => 'Standalone', diff --git a/Theme/Backend/helper-single.tpl.php b/Theme/Backend/helper-single.tpl.php index bf3292b..9b131a2 100644 --- a/Theme/Backend/helper-single.tpl.php +++ b/Theme/Backend/helper-single.tpl.php @@ -12,6 +12,9 @@ */ declare(strict_types=1); +use phpOMS\Model\Html\FormElementGenerator; +use phpOMS\Uri\UriFactory; + /** * @var \phpOMS\Views\View $this */ @@ -24,19 +27,19 @@ $report = $this->getData('report'); /** @noinspection PhpIncludeInspection */ $reportLanguage = isset($tcoll['lang']) ? include __DIR__ . '/../../../../' . \ltrim($tcoll['lang']->getPath(), '/') : []; $lang = $reportLanguage[$cLang] ?? []; +$settings = isset($tcoll['cfg']) ? \json_decode(\file_get_contents(__DIR__ . '/../../../../' . \ltrim($tcoll['cfg']->getPath(), '/')), true) : []; echo $this->getData('nav')->render(); ?>