diff --git a/Admin/Install/Media.php b/Admin/Install/Media.php index cd7cdec..9fd338a 100755 --- a/Admin/Install/Media.php +++ b/Admin/Install/Media.php @@ -45,6 +45,6 @@ class Media $defaultTemplate = \reset($media['upload'][0]); $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')); } } diff --git a/Admin/Routes/Web/Api.php b/Admin/Routes/Web/Api.php index 6d76688..6be2c91 100755 --- a/Admin/Routes/Web/Api.php +++ b/Admin/Routes/Web/Api.php @@ -1,4 +1,16 @@ -addData('nav', $this->app->moduleManager->get('Navigation')->createNavigationMid(1006201001, $request, $response)); 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') { - $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 { - $view->setData('audits', AuditMapper::getAfterPivot(0, null, 25)); + $view->setData('audits', AuditMapper::sortBy('createdAt', 'DESC')::getAfterPivot(0, null, 25)); } return $view; diff --git a/Theme/Backend/audit-list.tpl.php b/Theme/Backend/audit-list.tpl.php index cd51a09..c5974d5 100755 --- a/Theme/Backend/audit-list.tpl.php +++ b/Theme/Backend/audit-list.tpl.php @@ -130,8 +130,9 @@ echo $this->getData('nav')->render(); ?> - $audit) : ++$count; - $url = UriFactory::build('{/prefix}admin/audit/single?{?}&id=' . $audit->getId()); ?> + $audit) : ++$count; + $url = UriFactory::build('{/prefix}admin/audit/single?{?}&id=' . $audit->getId()); ?> getId(); ?> printHtml($audit->getModule()); ?> diff --git a/Theme/Backend/audit-single.tpl.php b/Theme/Backend/audit-single.tpl.php index fe34bd6..570330a 100755 --- a/Theme/Backend/audit-single.tpl.php +++ b/Theme/Backend/audit-single.tpl.php @@ -66,8 +66,14 @@ echo $this->getData('nav')->render();
getOld() ?? ''),
-                            ViewAbstract::html($audit->getNew() ?? ''),
+                            ViewAbstract::html(\stripos($audit->getOld() ?? '', '{') === 0
+                                ? \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"
                         ); ?>