From b146aed47b8074fa4e3110fff10cb3e99b207f04 Mon Sep 17 00:00:00 2001 From: Dennis Eichhorn Date: Sat, 11 Mar 2023 23:38:16 +0100 Subject: [PATCH] too many changes --- Admin/Install/db.json | 3 ++- Models/AuditMapper.php | 4 ++-- Theme/Backend/audit-list.tpl.php | 2 +- Theme/Backend/audit-single.tpl.php | 2 +- composer.json | 2 +- info.json | 2 +- 6 files changed, 8 insertions(+), 7 deletions(-) diff --git a/Admin/Install/db.json b/Admin/Install/db.json index 2e4bee6..c7b0dcb 100755 --- a/Admin/Install/db.json +++ b/Admin/Install/db.json @@ -63,7 +63,8 @@ "auditor_audit_created_by": { "name": "auditor_audit_created_by", "type": "INT", - "null": false, + "null": true, + "default": null, "foreignTable": "account", "foreignKey": "account_id" }, diff --git a/Models/AuditMapper.php b/Models/AuditMapper.php index b55fc49..02c5db4 100755 --- a/Models/AuditMapper.php +++ b/Models/AuditMapper.php @@ -42,7 +42,7 @@ final class AuditMapper extends DataMapperFactory 'auditor_audit_ref' => ['name' => 'auditor_audit_ref', 'type' => 'string', 'internal' => 'ref'], 'auditor_audit_type' => ['name' => 'auditor_audit_type', 'type' => 'int', 'internal' => 'type'], 'auditor_audit_trigger' => ['name' => 'auditor_audit_trigger', 'type' => 'string', 'internal' => 'trigger'], - 'auditor_audit_content' => ['name' => 'auditor_audit_content', 'type' => 'string', 'internal' => 'content'], + 'auditor_audit_content' => ['name' => 'auditor_audit_content', 'type' => 'compress', 'internal' => 'content'], 'auditor_audit_old' => ['name' => 'auditor_audit_old', 'type' => 'compress', 'internal' => 'old'], 'auditor_audit_new' => ['name' => 'auditor_audit_new', 'type' => 'compress', 'internal' => 'new'], 'auditor_audit_blockchain' => ['name' => 'auditor_audit_blockchain', 'type' => 'string', 'internal' => 'blockchain', 'readonly' => true], @@ -83,7 +83,7 @@ final class AuditMapper extends DataMapperFactory * @var string * @since 1.0.0 */ - public const PRIMARYFIELD ='auditor_audit_id'; + public const PRIMARYFIELD = 'auditor_audit_id'; /** * Created at. diff --git a/Theme/Backend/audit-list.tpl.php b/Theme/Backend/audit-list.tpl.php index f54aee0..b73f34d 100755 --- a/Theme/Backend/audit-list.tpl.php +++ b/Theme/Backend/audit-list.tpl.php @@ -80,7 +80,7 @@ echo $this->getData('nav')->render(); ?> printHtml( $this->renderUserName('%3$s %2$s %1$s', [$audit->createdBy->name1, $audit->createdBy->name2, $audit->createdBy->name3, $audit->createdBy->login]) ); ?> - printHtml($audit->ref); ?> + printHtml((string) $audit->ref); ?> createdAt->format('Y-m-d H:i:s'); ?> diff --git a/Theme/Backend/audit-single.tpl.php b/Theme/Backend/audit-single.tpl.php index d976356..1c3bee6 100755 --- a/Theme/Backend/audit-single.tpl.php +++ b/Theme/Backend/audit-single.tpl.php @@ -56,7 +56,7 @@ echo $this->getData('nav')->render(); createdBy->name1; ?> createdBy->name2; ?> getHtml('Ref'); ?> - printHtml($audit->ref); ?> + printHtml((string) $audit->ref); ?> getHtml('Date'); ?> getDateTime($audit->createdAt, 'very_long'); ?> diff --git a/composer.json b/composer.json index 15e8d01..6fc1e5d 100755 --- a/composer.json +++ b/composer.json @@ -1,6 +1,6 @@ { "name": "karaka/module", - "description": "Module for Karaka.", + "description": "Module for Jingga.", "authors": [ { "name": "Dennis Eichhorn", diff --git a/info.json b/info.json index a493660..9fd7630 100755 --- a/info.json +++ b/info.json @@ -11,7 +11,7 @@ "phpOMS-db": "1.0.0" }, "creator": { - "name": "Karaka", + "name": "Jingga", "website": "jingga.app" }, "description": "The administration module.",