From 0eb67b7a9a7971dbf102d3cc17d385ba24716f92 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Laurent=20S=C3=A9guin?= <laurent.seguin@maarch.org>
Date: Fri, 17 Mar 2017 14:26:15 +0100
Subject: [PATCH] Revert "Merge branch 'develop' of
labs.maarch.org:maarch/MaarchCourrier into develop"
This reverts commit 076512d2ca534018df68acbb1a233d19817cb50f
---
.../Models/ResModelAbstract.php | 4 +-
modules/visa/Controllers/VisaController.php | 65 +++++++++----------
2 files changed, 34 insertions(+), 35 deletions(-)
diff --git a/apps/maarch_entreprise/Models/ResModelAbstract.php b/apps/maarch_entreprise/Models/ResModelAbstract.php
index e147e3b5398..874131d0d8b 100644
--- a/apps/maarch_entreprise/Models/ResModelAbstract.php
+++ b/apps/maarch_entreprise/Models/ResModelAbstract.php
@@ -24,7 +24,7 @@ require_once 'apps/maarch_entreprise/services/Table.php';
class ResModelAbstract extends Apps_Table_Service
{
- public static function getById(array $aArgs = [])
+ public static function get(array $aArgs = [])
{
static::checkRequired($aArgs, ['resId']);
static::checkNumeric($aArgs, ['resId']);
@@ -37,7 +37,7 @@ class ResModelAbstract extends Apps_Table_Service
'data' => [$aArgs['resId']]
]);
- return $aReturn[0];
+ return $aReturn;
}
public static function put(array $aArgs = [])
diff --git a/modules/visa/Controllers/VisaController.php b/modules/visa/Controllers/VisaController.php
index 19f83a30493..eabea471cca 100644
--- a/modules/visa/Controllers/VisaController.php
+++ b/modules/visa/Controllers/VisaController.php
@@ -35,19 +35,16 @@ class VisaController
$resId = $aArgs['resId'];
$basketId = $aArgs['basketId'];
- $incomingMail = \ResModel::getById([
- 'resId' => $resId,
- 'select' => ['res_id', 'subject', 'alt_identifier', 'contact_id', 'address_id', 'user_lastname', 'user_firstname']
- ]);
-
- if (empty($incomingMail)) {
- return $response->withJson(['Error' => 'No Document Found']);
- }
- if (!empty($incomingMail['contact_id'])) {
- $incomingMailSender = \ContactsModel::getLabelledContactWithAddress(['contactId' => $incomingMail['contact_id'], 'addressId' => $incomingMail['address_id']]);
- } else {
- $incomingMailSender = $incomingMail['user_firstname'] . ' ' . $incomingMail['user_lastname'];
- }
+ $incomingMail = \ResModel::get(
+ [
+ 'resId' => $resId,
+ 'select' => ['res_id', 'subject', 'alt_identifier']
+ ]
+ );
+
+ if (empty($incomingMail[0])) {
+ return $response->withJson(['Error' => 'No Document Found']);
+ }
$basket = new \basket();
$actions = $basket->get_actions_from_current_basket($resId, 'letterbox_coll', 'PAGE_USE', false);
@@ -66,20 +63,22 @@ class VisaController
]
);
- $documents = [
- [
- 'title' => $incomingMail['subject'],
- 'viewerLink' => "index.php?display=true&dir=indexing_searching&page=view_resource_controler&visu&id={$resId}&collid=letterbox_coll",
- 'thumbnailLink' => "index.php?page=doc_thumb&module=thumbnails&res_id={$resId}&coll_id=letterbox_coll&display=true&advanced=true"
- ]
- ];
- foreach ($incomingMailAttachments as $value) {
- $documents[] = [
- 'title' => $value['title'],
- 'viewerLink' => "index.php?display=true&module=visa&page=view_pdf_attachement&res_id_master={$resId}&id={$value['res_id']}",
- 'thumbnailLink' => "index.php?page=doc_thumb&module=thumbnails&res_id={$value['res_id']}&coll_id=attachments_coll&display=true&advanced=true"
- ];
- }
+ $documents = [
+ [
+ 'title' => $incomingMail[0]['subject'],
+ 'truncateTitle' => ((strlen($incomingMail[0]['subject']) > 10) ? (substr($incomingMail[0]['subject'], 0, 10) . '...') : $incomingMail[0]['subject']),
+ 'viewerLink' => "index.php?display=true&dir=indexing_searching&page=view_resource_controler&visu&id={$resId}&collid=letterbox_coll",
+ 'thumbnailLink' => "index.php?page=doc_thumb&module=thumbnails&res_id={$resId}&coll_id=letterbox_coll&display=true&advanced=true"
+ ]
+ ];
+ foreach ($incomingMailAttachments as $value) {
+ $documents[] = [
+ 'title' => $value['title'],
+ 'truncateTitle' => ((strlen($value['title']) > 10) ? (substr($value['title'], 0, 10) . '...') : $value['title']),
+ 'viewerLink' => "index.php?display=true&module=visa&page=view_pdf_attachement&res_id_master={$resId}&id={$value['res_id']}",
+ 'thumbnailLink' => "index.php?page=doc_thumb&module=thumbnails&res_id={$value['res_id']}&coll_id=attachments_coll&display=true&advanced=true"
+ ];
+ }
// $history = \HistoryModel::getByIdForActions([
// 'id' => $resId,
@@ -122,12 +121,12 @@ class VisaController
unset($resList[$key]['priority'], $resList[$key]['contact_id'], $resList[$key]['address_id'], $resList[$key]['user_lastname'], $resList[$key]['user_firstname']);
}
- $actionLabel = (_ID_TO_DISPLAY == 'res_id' ? $incomingMail['res_id'] : $incomingMail['alt_identifier']);
- $actionLabel .= " : {$incomingMail['subject']} - {$incomingMailSender}";
- $currentAction = [
- 'id' => $_SESSION['current_basket']['default_action'], //TODO No Session
- 'actionLabel' => $actionLabel
- ];
+ $actionLabel = (_ID_TO_DISPLAY == 'res_id' ? $incomingMail[0]['res_id'] : $incomingMail[0]['alt_identifier']);
+ $actionLabel .= ' : ' . $incomingMail[0]['subject'];
+ $currentAction = [
+ 'id' => $_SESSION['current_basket']['default_action'], //TODO No Session
+ 'actionLabel' => $actionLabel
+ ];
$datas = [];
--
GitLab