Jingga/oms-Navigation
1
0
Fork 0
mirror of https://github.com/Karaka-Management/oms-Navigation.git synced 2026-02-13 07:18:40 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

new datamapper mostly implemented

Browse Source
This commit is contained in:
Dennis Eichhorn 2021-12-11 11:54:17 +01:00
parent c1d1da8929
commit f7a9b08e74
5 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Admin/Installer.php
View File

@ -110,7 +110,7 @@ final class Installer extends InstallerAbstract
$navElement->permissionType = $data['permission']['type'] ?? null; $navElement->permissionType = $data['permission']['type'] ?? null;
$navElement->permissionElement = $data['permission']['element'] ?? null; $navElement->permissionElement = $data['permission']['element'] ?? null;
NavElementMapper::create($navElement); NavElementMapper::create()->execute($navElement);
foreach ($data['children'] as $link) { foreach ($data['children'] as $link) {
self::installLink($dbPool, $link); self::installLink($dbPool, $link);

6
Controller/BackendController.php
View File

@ -176,12 +176,12 @@ final class BackendController extends Controller
$id = $request->getData('id') ?? ''; $id = $request->getData('id') ?? '';
$settings = SettingMapper::getFor($id, 'module'); $settings = SettingMapper::getAll()->where('module', $id)->execute();
if (!($settings instanceof NullSetting)) { if (!($settings instanceof NullSetting)) {
$view->setData('settings', !\is_array($settings) ? [$settings] : $settings); $view->setData('settings', !\is_array($settings) ? [$settings] : $settings);
} }
$navigation = NavElementMapper::getAll(); $navigation = NavElementMapper::getAll()->execute();
$view->setData('navigation', $navigation); $view->setData('navigation', $navigation);
if (\is_file(__DIR__ . '/../Admin/Settings/Theme/Backend/settings.tpl.php')) { if (\is_file(__DIR__ . '/../Admin/Settings/Theme/Backend/settings.tpl.php')) {
@ -210,7 +210,7 @@ final class BackendController extends Controller
$view->setTemplate('/Modules/' . static::NAME . '/Admin/Settings/Theme/Backend/settings-nav'); $view->setTemplate('/Modules/' . static::NAME . '/Admin/Settings/Theme/Backend/settings-nav');
$view->addData('nav', $this->app->moduleManager->get('Navigation')->createNavigationMid(1000105001, $request, $response)); $view->addData('nav', $this->app->moduleManager->get('Navigation')->createNavigationMid(1000105001, $request, $response));
$view->addData('nav-element', NavElementMapper::get((int) $request->getData('nav'))); $view->addData('nav-element', NavElementMapper::get()->where('id', (int) $request->getData('nav')))->execute();
return $view; return $view;
} }

2
Controller/SearchController.php
View File

@ -51,7 +51,7 @@ final class SearchController extends Controller
$this->loadLanguage($request, $response, $request->getData('app')); $this->loadLanguage($request, $response, $request->getData('app'));
/** @var \Modules\Navigation\Models\NavElement[] $elements */ /** @var \Modules\Navigation\Models\NavElement[] $elements */
$elements = NavElementMapper::getAll(); $elements = NavElementMapper::getAll()->execute();
$searchIdStartPos = \stripos($request->getData('search'), ':'); $searchIdStartPos = \stripos($request->getData('search'), ':');
$patternStartPos = $searchIdStartPos === false ? -1 : \stripos( $patternStartPos = $searchIdStartPos === false ? -1 : \stripos(

14
Models/NavElementMapper.php
View File

@ -14,7 +14,7 @@ declare(strict_types=1);
namespace Modules\Navigation\Models; namespace Modules\Navigation\Models;
use phpOMS\DataStorage\Database\DataMapperAbstract; use phpOMS\DataStorage\Database\Mapper\DataMapperFactory;
/** /**
* Mapper class. * Mapper class.
@ -24,7 +24,7 @@ use phpOMS\DataStorage\Database\DataMapperAbstract;
* @link https://orange-management.org * @link https://orange-management.org
* @since 1.0.0 * @since 1.0.0
*/ */
final class NavElementMapper extends DataMapperAbstract final class NavElementMapper extends DataMapperFactory
{ {
/** /**
* Columns. * Columns.
@ -32,7 +32,7 @@ final class NavElementMapper extends DataMapperAbstract
* @var array<string, array{name:string, type:string, internal:string, autocomplete?:bool, readonly?:bool, writeonly?:bool, annotations?:array}> * @var array<string, array{name:string, type:string, internal:string, autocomplete?:bool, readonly?:bool, writeonly?:bool, annotations?:array}>
* @since 1.0.0 * @since 1.0.0
*/ */
protected static array $columns = [ public const COLUMNS = [
'nav_id' => ['name' => 'nav_id', 'type' => 'int', 'internal' => 'id'], 'nav_id' => ['name' => 'nav_id', 'type' => 'int', 'internal' => 'id'],
'nav_app' => ['name' => 'nav_app', 'type' => 'int', 'internal' => 'app'], 'nav_app' => ['name' => 'nav_app', 'type' => 'int', 'internal' => 'app'],
'nav_pid' => ['name' => 'nav_pid', 'type' => 'string', 'internal' => 'pid'], 'nav_pid' => ['name' => 'nav_pid', 'type' => 'string', 'internal' => 'pid'],
@ -59,7 +59,7 @@ final class NavElementMapper extends DataMapperAbstract
* @var string * @var string
* @since 1.0.0 * @since 1.0.0
*/ */
protected static string $model = NavElement::class; public const MODEL = NavElement::class;
/** /**
* Primary table. * Primary table.
@ -67,7 +67,7 @@ final class NavElementMapper extends DataMapperAbstract
* @var string * @var string
* @since 1.0.0 * @since 1.0.0
*/ */
protected static string $table = 'nav'; public const TABLE = 'nav';
/** /**
* Primary field name. * Primary field name.
@ -75,7 +75,7 @@ final class NavElementMapper extends DataMapperAbstract
* @var string * @var string
* @since 1.0.0 * @since 1.0.0
*/ */
protected static string $primaryField = 'nav_id'; public const PRIMARYFIELD ='nav_id';
/** /**
* Autoincrement primary field. * Autoincrement primary field.
@ -83,5 +83,5 @@ final class NavElementMapper extends DataMapperAbstract
* @var bool * @var bool
* @since 1.0.0 * @since 1.0.0
*/ */
protected static bool $autoincrement = false; public const AUTOINCREMENT = false;
} }

4
tests/Bootstrap.php
View File

@ -12,7 +12,7 @@ require_once __DIR__ . '/../vendor/autoload.php';
require_once __DIR__ . '/Autoloader.php'; require_once __DIR__ . '/Autoloader.php';
use phpOMS\DataStorage\Database\DatabasePool; use phpOMS\DataStorage\Database\DatabasePool;
use phpOMS\DataStorage\Database\DataMapperAbstract; use phpOMS\DataStorage\Database\Mapper\DataMapperFactory;
use phpOMS\DataStorage\Session\HttpSession; use phpOMS\DataStorage\Session\HttpSession;
$CONFIG = [ $CONFIG = [
@ -329,7 +329,7 @@ $GLOBALS['dbpool']->create('delete', $CONFIG['db']['core']['masters']['delete'])
$GLOBALS['dbpool']->create('insert', $CONFIG['db']['core']['masters']['insert']); $GLOBALS['dbpool']->create('insert', $CONFIG['db']['core']['masters']['insert']);
$GLOBALS['dbpool']->create('schema', $CONFIG['db']['core']['masters']['schema']); $GLOBALS['dbpool']->create('schema', $CONFIG['db']['core']['masters']['schema']);
DataMapperAbstract::setConnection($GLOBALS['dbpool']->get()); DataMapperFactory::db($GLOBALS['dbpool']->get());
$GLOBALS['frameworkpath'] = '/phpOMS/'; $GLOBALS['frameworkpath'] = '/phpOMS/';