mirror of
https://github.com/Karaka-Management/oms-Auditor.git
synced 2026-02-14 20:48:41 +00:00
september update 1
This commit is contained in:
parent
219747a2ca
commit
d690b5dd35
|
|
@ -45,6 +45,6 @@ class Media
|
||||||
$defaultTemplate = \reset($media['upload'][0]);
|
$defaultTemplate = \reset($media['upload'][0]);
|
||||||
|
|
||||||
$setting = new Setting();
|
$setting = new Setting();
|
||||||
SettingMapper::create($setting->with(0, 'default_pdf_template', (string) $defaultTemplate->getId(), 'Auditor'));
|
SettingMapper::create($setting->with(0, 'default_pdf_template', (string) $defaultTemplate->getId(), '\\d+', 'Auditor'));
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -1,4 +1,16 @@
|
||||||
<?php declare(strict_types=1);
|
<?php
|
||||||
|
/**
|
||||||
|
* Orange Management
|
||||||
|
*
|
||||||
|
* PHP Version 8.0
|
||||||
|
*
|
||||||
|
* @package Modules
|
||||||
|
* @copyright Dennis Eichhorn
|
||||||
|
* @license OMS License 1.0
|
||||||
|
* @version 1.0.0
|
||||||
|
* @link https://orange-management.org
|
||||||
|
*/
|
||||||
|
declare(strict_types=1);
|
||||||
|
|
||||||
return [
|
return [
|
||||||
];
|
];
|
||||||
|
|
|
||||||
|
|
@ -1,4 +1,16 @@
|
||||||
<?php declare(strict_types=1);
|
<?php
|
||||||
|
/**
|
||||||
|
* Orange Management
|
||||||
|
*
|
||||||
|
* PHP Version 8.0
|
||||||
|
*
|
||||||
|
* @package Modules
|
||||||
|
* @copyright Dennis Eichhorn
|
||||||
|
* @license OMS License 1.0
|
||||||
|
* @version 1.0.0
|
||||||
|
* @link https://orange-management.org
|
||||||
|
*/
|
||||||
|
declare(strict_types=1);
|
||||||
|
|
||||||
use Modules\Auditor\Controller\BackendController;
|
use Modules\Auditor\Controller\BackendController;
|
||||||
use Modules\Auditor\Models\PermissionState;
|
use Modules\Auditor\Models\PermissionState;
|
||||||
|
|
|
||||||
|
|
@ -49,11 +49,11 @@ final class BackendController extends Controller
|
||||||
$view->addData('nav', $this->app->moduleManager->get('Navigation')->createNavigationMid(1006201001, $request, $response));
|
$view->addData('nav', $this->app->moduleManager->get('Navigation')->createNavigationMid(1006201001, $request, $response));
|
||||||
|
|
||||||
if ($request->getData('ptype') === 'p') {
|
if ($request->getData('ptype') === 'p') {
|
||||||
$view->setData('audits', AuditMapper::getBeforePivot((int) ($request->getData('id') ?? 0), null, 25));
|
$view->setData('audits', AuditMapper::sortBy('createdAt', 'DESC')::getBeforePivot((int) ($request->getData('id') ?? 0), null, 25));
|
||||||
} elseif ($request->getData('ptype') === 'n') {
|
} elseif ($request->getData('ptype') === 'n') {
|
||||||
$view->setData('audits', AuditMapper::getAfterPivot((int) ($request->getData('id') ?? 0), null, 25));
|
$view->setData('audits', AuditMapper::sortBy('createdAt', 'DESC')::getAfterPivot((int) ($request->getData('id') ?? 0), null, 25));
|
||||||
} else {
|
} else {
|
||||||
$view->setData('audits', AuditMapper::getAfterPivot(0, null, 25));
|
$view->setData('audits', AuditMapper::sortBy('createdAt', 'DESC')::getAfterPivot(0, null, 25));
|
||||||
}
|
}
|
||||||
|
|
||||||
return $view;
|
return $view;
|
||||||
|
|
|
||||||
|
|
@ -130,8 +130,9 @@ echo $this->getData('nav')->render(); ?>
|
||||||
<i class="filter fa fa-filter"></i>
|
<i class="filter fa fa-filter"></i>
|
||||||
</label>
|
</label>
|
||||||
<tbody>
|
<tbody>
|
||||||
<?php $count = 0; foreach ($audits as $key => $audit) : ++$count;
|
<?php $count = 0;
|
||||||
$url = UriFactory::build('{/prefix}admin/audit/single?{?}&id=' . $audit->getId()); ?>
|
foreach ($audits as $key => $audit) : ++$count;
|
||||||
|
$url = UriFactory::build('{/prefix}admin/audit/single?{?}&id=' . $audit->getId()); ?>
|
||||||
<tr tabindex="0" data-href="<?= $url; ?>">
|
<tr tabindex="0" data-href="<?= $url; ?>">
|
||||||
<td><?= $audit->getId(); ?>
|
<td><?= $audit->getId(); ?>
|
||||||
<td><?= $this->printHtml($audit->getModule()); ?>
|
<td><?= $this->printHtml($audit->getModule()); ?>
|
||||||
|
|
|
||||||
|
|
@ -66,8 +66,14 @@ echo $this->getData('nav')->render();
|
||||||
</table>
|
</table>
|
||||||
<article>
|
<article>
|
||||||
<pre><?= \phpOMS\Utils\StringUtils::createDiffMarkup(
|
<pre><?= \phpOMS\Utils\StringUtils::createDiffMarkup(
|
||||||
ViewAbstract::html($audit->getOld() ?? ''),
|
ViewAbstract::html(\stripos($audit->getOld() ?? '', '{') === 0
|
||||||
ViewAbstract::html($audit->getNew() ?? ''),
|
? \json_encode(\json_decode($audit->getOld()), \JSON_PRETTY_PRINT)
|
||||||
|
: $audit->getOld() ?? ''
|
||||||
|
),
|
||||||
|
ViewAbstract::html(\stripos($audit->getNew() ?? '', '{') === 0
|
||||||
|
? \json_encode(\json_decode($audit->getNew()), \JSON_PRETTY_PRINT)
|
||||||
|
: $audit->getNew() ?? ''
|
||||||
|
),
|
||||||
"\n"
|
"\n"
|
||||||
); ?>
|
); ?>
|
||||||
</pre>
|
</pre>
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue
Block a user