From b501895488973677ae7e6e19b7bdf19fced083a2 Mon Sep 17 00:00:00 2001
From: Damien <damien.burel@maarch.org>
Date: Wed, 8 Apr 2020 16:51:02 +0200
Subject: [PATCH] FEAT #13678 TIME 0:20 Fix from CR
---
sql/structure.sql | 2 +-
src/app/attachment/controllers/AttachmentController.php | 7 +++++--
src/app/entity/models/ListInstanceModelAbstract.php | 3 ++-
.../template-file-editor-modal.component.html | 4 ++--
4 files changed, 10 insertions(+), 6 deletions(-)
diff --git a/sql/structure.sql b/sql/structure.sql
index 99b4ce168dc..9642efd8ff5 100755
--- a/sql/structure.sql
+++ b/sql/structure.sql
@@ -248,7 +248,7 @@ CREATE TABLE res_attachments
res_id bigint NOT NULL DEFAULT nextval('res_attachment_res_id_seq'::regclass),
title character varying(255) DEFAULT NULL::character varying,
format character varying(50) NOT NULL,
- typist character varying(128) NOT NULL,
+ typist INTEGER,
creation_date timestamp without time zone NOT NULL,
modification_date timestamp without time zone DEFAULT NOW(),
modified_by INTEGER,
diff --git a/src/app/attachment/controllers/AttachmentController.php b/src/app/attachment/controllers/AttachmentController.php
index e13bd4fd278..8316464d7d1 100755
--- a/src/app/attachment/controllers/AttachmentController.php
+++ b/src/app/attachment/controllers/AttachmentController.php
@@ -293,8 +293,11 @@ class AttachmentController
if ($attachment['modificationDate'] == $attachment['creationDate']) {
$attachments[$key]['modificationDate'] = null;
}
- $typist = UserModel::getById(['id' => $attachment['typist'], 'select' => ['firstname', 'lastname']]);
- $attachments[$key]['typistLabel'] = $typist['firstname']. ' ' .$typist['lastname'];
+ $attachments[$key]['typistLabel'] = '';
+ if (!empty($attachment['typist'])) {
+ $typist = UserModel::getById(['id' => $attachment['typist'], 'select' => ['firstname', 'lastname']]);
+ $attachments[$key]['typistLabel'] = $typist['firstname']. ' ' .$typist['lastname'];
+ }
$attachments[$key]['modifiedBy'] = UserModel::getLabelledUserById(['id' => $attachment['modifiedBy']]);
if (!empty($attachmentsTypes[$attachment['type']]['label'])) {
diff --git a/src/app/entity/models/ListInstanceModelAbstract.php b/src/app/entity/models/ListInstanceModelAbstract.php
index 7693ea6ea6d..5941db189bb 100755
--- a/src/app/entity/models/ListInstanceModelAbstract.php
+++ b/src/app/entity/models/ListInstanceModelAbstract.php
@@ -173,7 +173,8 @@ abstract class ListInstanceModelAbstract
public static function getWithConfidentiality(array $args)
{
ValidatorModel::notEmpty($args, ['entityId', 'userId']);
- ValidatorModel::stringType($args, ['entityId', 'userId']);
+ ValidatorModel::stringType($args, ['entityId']);
+ ValidatorModel::intVal($args, ['userId']);
ValidatorModel::arrayType($args, ['select']);
$aListInstances = DatabaseModel::select([
diff --git a/src/frontend/app/administration/template/templateFileEditorModal/template-file-editor-modal.component.html b/src/frontend/app/administration/template/templateFileEditorModal/template-file-editor-modal.component.html
index 0d2a71e8664..11dd54c779b 100644
--- a/src/frontend/app/administration/template/templateFileEditorModal/template-file-editor-modal.component.html
+++ b/src/frontend/app/administration/template/templateFileEditorModal/template-file-editor-modal.component.html
@@ -2,7 +2,7 @@
<mat-dialog-content style="padding: 0px;">
<onlyoffice-viewer #onlyofficeViewer style="height:100%;width:100%;" [hideCloseEditor]="true"
[params]="editorOptions" [file]="file" [editMode]="true" (triggerAfterUpdatedDoc)="close()"
- (triggerCloseEditor)="dialogRef.close('');" (triggerModifiedDocument)="isDocModified = true"></onlyoffice-viewer>
+ (triggerCloseEditor)="dialogRef.close('');"></onlyoffice-viewer>
</mat-dialog-content>
<span class="divider-modal"></span>
<div mat-dialog-actions class="actions">
@@ -10,4 +10,4 @@
(click)="close()">{{lang.validate}}</button>
<button mat-raised-button mat-button [disabled]="loading" [mat-dialog-close]="">{{lang.cancel}}</button>
</div>
-</div>
\ No newline at end of file
+</div>
--
GitLab