From 98c2cac6f9cde248e0f4e28d6b9aa03d93b0db09 Mon Sep 17 00:00:00 2001
From: Damien <damien.burel@maarch.org>
Date: Wed, 16 Oct 2019 17:09:07 +0200
Subject: [PATCH] FIX #12070 TIME 0:10 Typist problems
---
src/app/folder/controllers/FolderController.php | 2 +-
src/app/resource/controllers/ExportController.php | 4 ++--
src/app/resource/controllers/ResourceListController.php | 2 +-
src/app/resource/controllers/SummarySheetController.php | 2 +-
src/app/resource/models/ResModelAbstract.php | 4 ++--
5 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/src/app/folder/controllers/FolderController.php b/src/app/folder/controllers/FolderController.php
index 611fa523b27..16d04219212 100755
--- a/src/app/folder/controllers/FolderController.php
+++ b/src/app/folder/controllers/FolderController.php
@@ -449,7 +449,7 @@ class FolderController
$attachments = AttachmentModel::getOnView([
'select' => ['COUNT(res_id)', 'res_id_master'],
'where' => ['res_id_master in (?)', 'status not in (?)', 'attachment_type not in (?)', '((status = ? AND typist = ?) OR status != ?)'],
- 'data' => [$resIds, ['DEL', 'OBS'], $excludeAttachmentTypes, 'TMP', $GLOBALS['userId'], 'TMP'],
+ 'data' => [$resIds, ['DEL', 'OBS'], $excludeAttachmentTypes, 'TMP', $GLOBALS['id'], 'TMP'],
'groupBy' => ['res_id_master']
]);
diff --git a/src/app/resource/controllers/ExportController.php b/src/app/resource/controllers/ExportController.php
index d90d96ab0ff..ea7289c2dd6 100644
--- a/src/app/resource/controllers/ExportController.php
+++ b/src/app/resource/controllers/ExportController.php
@@ -263,7 +263,7 @@ class ExportController
$aRecipients = empty($recipients[$resource['res_id']]) ? [] : $recipients[$resource['res_id']];
$csvContent[] = implode("\n\n", $aRecipients);
} elseif ($value['value'] == 'getTypist') {
- $csvContent[] = UserModel::getLabelledUserById(['login' => $resource['typist']]);
+ $csvContent[] = UserModel::getLabelledUserById(['id' => $resource['typist']]);
} elseif ($value['value'] == 'getAssignee') {
$csvContent[] = UserModel::getLabelledUserById(['login' => $resource['dest_user']]);
} elseif ($value['value'] == 'getTags') {
@@ -381,7 +381,7 @@ class ExportController
$content[] = implode("\n\n", $aRecipients);
}
} elseif ($value['value'] == 'getTypist') {
- $content[] = UserModel::getLabelledUserById(['login' => $resource['typist']]);
+ $content[] = UserModel::getLabelledUserById(['id' => $resource['typist']]);
} elseif ($value['value'] == 'getAssignee') {
$content[] = UserModel::getLabelledUserById(['login' => $resource['dest_user']]);
} elseif ($value['value'] == 'getTags') {
diff --git a/src/app/resource/controllers/ResourceListController.php b/src/app/resource/controllers/ResourceListController.php
index c1798f29547..3d7f69ba0d9 100644
--- a/src/app/resource/controllers/ResourceListController.php
+++ b/src/app/resource/controllers/ResourceListController.php
@@ -94,7 +94,7 @@ class ResourceListController
$attachments = AttachmentModel::getOnView([
'select' => ['COUNT(res_id)', 'res_id_master'],
'where' => ['res_id_master in (?)', 'status not in (?)', 'attachment_type not in (?)', '((status = ? AND typist = ?) OR status != ?)'],
- 'data' => [$resIds, ['DEL', 'OBS'], $excludeAttachmentTypes, 'TMP', $GLOBALS['userId'], 'TMP'],
+ 'data' => [$resIds, ['DEL', 'OBS'], $excludeAttachmentTypes, 'TMP', $GLOBALS['id'], 'TMP'],
'groupBy' => ['res_id_master']
]);
diff --git a/src/app/resource/controllers/SummarySheetController.php b/src/app/resource/controllers/SummarySheetController.php
index 554d69cbed1..a7177cefd31 100755
--- a/src/app/resource/controllers/SummarySheetController.php
+++ b/src/app/resource/controllers/SummarySheetController.php
@@ -231,7 +231,7 @@ class SummarySheetController
$initiator = EntityModel::getByEntityId(['entityId' => $resource['initiator'], 'select' => ['short_label']]);
}
$initiatorEntity = empty($initiator) ? '' : "({$initiator['short_label']})";
- $typist = UserModel::getLabelledUserById(['login' => $resource['typist']]);
+ $typist = UserModel::getLabelledUserById(['id' => $resource['typist']]);
$doctype = empty($resource['type_label']) ? '<i>'._UNDEFINED.'</i>' : "<b>{$resource['type_label']}</b>";
$pdf->SetY($pdf->GetY() + 40);
diff --git a/src/app/resource/models/ResModelAbstract.php b/src/app/resource/models/ResModelAbstract.php
index fe9f43ba08a..b3f2e694180 100755
--- a/src/app/resource/models/ResModelAbstract.php
+++ b/src/app/resource/models/ResModelAbstract.php
@@ -83,8 +83,8 @@ abstract class ResModelAbstract
public static function create(array $aArgs)
{
ValidatorModel::notEmpty($aArgs, ['format', 'typist', 'creation_date', 'docserver_id', 'path', 'filename', 'fingerprint', 'filesize', 'status', 'category_id']);
- ValidatorModel::stringType($aArgs, ['format', 'typist', 'creation_date', 'docserver_id', 'path', 'filename', 'fingerprint', 'status', 'category_id']);
- ValidatorModel::intVal($aArgs, ['filesize', 'res_id']);
+ ValidatorModel::stringType($aArgs, ['format', 'creation_date', 'docserver_id', 'path', 'filename', 'fingerprint', 'status', 'category_id']);
+ ValidatorModel::intVal($aArgs, ['filesize', 'res_id', 'typist']);
if (empty($aArgs['res_id'])) {
$aArgs['res_id'] = DatabaseModel::getNextSequenceValue(['sequenceId' => 'res_id_mlb_seq']);
--
GitLab