Skip to content
Snippets Groups Projects
Commit 5f61686c authored by Alex ORLUC's avatar Alex ORLUC
Browse files

Merge branch 'develop' of https://labs.maarch.org/maarch/MaarchCourrier into develop

parents 3d3c59b1 63a07e51
No related branches found
No related tags found
No related merge requests found
...@@ -60,6 +60,9 @@ class ContactsModelAbstract extends Apps_Table_Service ...@@ -60,6 +60,9 @@ class ContactsModelAbstract extends Apps_Table_Service
$labelledContact = ''; $labelledContact = '';
if (!empty($rawContact[0])) { if (!empty($rawContact[0])) {
if (empty($rawContact[0]['firstname']) && empty($rawContact[0]['lastname'])) {
$rawContact = self::getById(['id' => $aArgs['contactId'], 'select' => ['firstname', 'lastname']]);
}
$labelledContact = $rawContact[0]['firstname']. ' ' .$rawContact[0]['lastname']; $labelledContact = $rawContact[0]['firstname']. ' ' .$rawContact[0]['lastname'];
} }
......
...@@ -97,6 +97,7 @@ class VisaController ...@@ -97,6 +97,7 @@ class VisaController
$resList[$key]['process_limit_date'] = date(DATE_ATOM, strtotime($resList[$key]['process_limit_date'])); $resList[$key]['process_limit_date'] = date(DATE_ATOM, strtotime($resList[$key]['process_limit_date']));
$resList[$key]['allSigned'] = $allSigned; $resList[$key]['allSigned'] = $allSigned;
$resList[$key]['priorityColor'] = $_SESSION['mail_priorities_color'][$value['priority']]; //TODO No Session $resList[$key]['priorityColor'] = $_SESSION['mail_priorities_color'][$value['priority']]; //TODO No Session
$resList[$key]['priorityLabel'] = $_SESSION['mail_priorities'][$value['priority']]; //TODO No Session
unset($resList[$key]['priority'], $resList[$key]['contact_id'], $resList[$key]['address_id'], $resList[$key]['user_lastname'], $resList[$key]['user_firstname']); unset($resList[$key]['priority'], $resList[$key]['contact_id'], $resList[$key]['address_id'], $resList[$key]['user_lastname'], $resList[$key]['user_firstname']);
} }
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment