Jingga/oms-Exchange
1
0
Fork 0
mirror of https://github.com/Karaka-Management/oms-Exchange.git synced 2026-01-11 16:48:42 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

general fixes

Browse Source
This commit is contained in:
Dennis Eichhorn 2024-04-19 02:08:37 +00:00
parent 6d85583ff6
commit da9101c76c
2 changed files with 24 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
Controller/BackendController.php
View File

@ -17,6 +17,7 @@ namespace Modules\Exchange\Controller;
use Modules\Exchange\Models\ExchangeLogMapper; use Modules\Exchange\Models\ExchangeLogMapper;
use Modules\Exchange\Models\InterfaceManagerMapper; use Modules\Exchange\Models\InterfaceManagerMapper;
use phpOMS\Contract\RenderableInterface; use phpOMS\Contract\RenderableInterface;
use phpOMS\Message\Http\RequestStatusCode;
use phpOMS\Message\RequestAbstract; use phpOMS\Message\RequestAbstract;
use phpOMS\Message\ResponseAbstract; use phpOMS\Message\ResponseAbstract;
use phpOMS\Views\View; use phpOMS\Views\View;
@ -168,8 +169,6 @@ final class BackendController extends Controller
public function viewExchangeExport(RequestAbstract $request, ResponseAbstract $response, array $data = []) : RenderableInterface public function viewExchangeExport(RequestAbstract $request, ResponseAbstract $response, array $data = []) : RenderableInterface
{ {
$view = new View($this->app->l11nManager, $request, $response); $view = new View($this->app->l11nManager, $request, $response);
$view->setTemplate('/Modules/Exchange/Theme/Backend/exchange-export');
$view->data['nav'] = $this->app->moduleManager->get('Navigation')->createNavigationMid(1007001001, $request, $response);
/** @var \Modules\Exchange\Models\InterfaceManager $interface */ /** @var \Modules\Exchange\Models\InterfaceManager $interface */
$interface = InterfaceManagerMapper::get() $interface = InterfaceManagerMapper::get()
@ -179,6 +178,16 @@ final class BackendController extends Controller
->where('id', (int) $request->getData('id')) ->where('id', (int) $request->getData('id'))
->execute(); ->execute();
if ($interface->id === 0) {
$response->header->status = RequestStatusCode::R_404;
$view->setTemplate('/Web/Backend/Error/404');
return $view;
}
$view->setTemplate('/Modules/Exchange/Theme/Backend/exchange-export');
$view->data['nav'] = $this->app->moduleManager->get('Navigation')->createNavigationMid(1007001001, $request, $response);
$view->data['interface'] = $interface; $view->data['interface'] = $interface;
$view->data['db'] = $this->app->dbPool->get(); $view->data['db'] = $this->app->dbPool->get();
@ -206,8 +215,6 @@ final class BackendController extends Controller
public function viewExchangeImport(RequestAbstract $request, ResponseAbstract $response, array $data = []) : RenderableInterface public function viewExchangeImport(RequestAbstract $request, ResponseAbstract $response, array $data = []) : RenderableInterface
{ {
$view = new View($this->app->l11nManager, $request, $response); $view = new View($this->app->l11nManager, $request, $response);
$view->setTemplate('/Modules/Exchange/Theme/Backend/exchange-import');
$view->data['nav'] = $this->app->moduleManager->get('Navigation')->createNavigationMid(1007001001, $request, $response);
/** @var \Modules\Exchange\Models\InterfaceManager $interface */ /** @var \Modules\Exchange\Models\InterfaceManager $interface */
$interface = InterfaceManagerMapper::get() $interface = InterfaceManagerMapper::get()
@ -217,6 +224,16 @@ final class BackendController extends Controller
->where('id', (int) $request->getData('id')) ->where('id', (int) $request->getData('id'))
->execute(); ->execute();
if ($interface->id === 0) {
$response->header->status = RequestStatusCode::R_404;
$view->setTemplate('/Web/Backend/Error/404');
return $view;
}
$view->setTemplate('/Modules/Exchange/Theme/Backend/exchange-import');
$view->data['nav'] = $this->app->moduleManager->get('Navigation')->createNavigationMid(1007001001, $request, $response);
$view->data['interface'] = $interface; $view->data['interface'] = $interface;
$view->data['db'] = $this->app->dbPool->get(); $view->data['db'] = $this->app->dbPool->get();

4
Models/ExchangeLog.php
View File

@ -15,6 +15,7 @@ declare(strict_types=1);
namespace Modules\Exchange\Models; namespace Modules\Exchange\Models;
use Modules\Admin\Models\Account; use Modules\Admin\Models\Account;
use Modules\Admin\Models\NullAccount;
/** /**
* Exchange class. * Exchange class.
@ -90,7 +91,7 @@ class ExchangeLog implements \JsonSerializable
* @var int|Account * @var int|Account
* @since 1.0.0 * @since 1.0.0
*/ */
public int | Account $createdBy = 0; public Account $createdBy;
/** /**
* Constructor. * Constructor.
@ -100,6 +101,7 @@ class ExchangeLog implements \JsonSerializable
public function __construct() public function __construct()
{ {
$this->createdAt = new \DateTimeImmutable('now'); $this->createdAt = new \DateTimeImmutable('now');
$this->createdBy = new NullAccount();
} }
/** /**