From df8ff6e9b6a3696b74a87b56158bd7f09afd0ecf Mon Sep 17 00:00:00 2001
From: Alex ORLUC <alex.orluc@maarch.org>
Date: Fri, 19 Oct 2018 15:25:39 +0200
Subject: [PATCH] update css + change entity_label by short_label
---
.../indexing_searching/documents_list_mlb_search_adv.php | 3 ++-
.../template/documents_list_search_adv.html | 6 +++---
2 files changed, 5 insertions(+), 4 deletions(-)
diff --git a/apps/maarch_entreprise/indexing_searching/documents_list_mlb_search_adv.php b/apps/maarch_entreprise/indexing_searching/documents_list_mlb_search_adv.php
index f8480a5a9dc..c9c654ae6b0 100755
--- a/apps/maarch_entreprise/indexing_searching/documents_list_mlb_search_adv.php
+++ b/apps/maarch_entreprise/indexing_searching/documents_list_mlb_search_adv.php
@@ -782,7 +782,7 @@ if ($mode == 'normal') {
$formattedContact = \SrcCore\controllers\AutoCompleteController::getFormattedContact(['contact' => $return_stmt]);
$tab[$i][$j]['value'] = $formattedContact['contact']['contact'];
} else if ($return_stmt->type == 'entity') {
- $query = 'SELECT entity_label FROM entities WHERE id = ?';
+ $query = 'SELECT short_label FROM entities WHERE id = ?';
$arrayPDO = array($return_stmt->item_id);
$stmt2 = $db->query($query, $arrayPDO);
$return_stmt = $stmt2->fetchObject();
@@ -801,6 +801,7 @@ if ($mode == 'normal') {
} else {
$tab[$i][$j]['value'] = '<b>'._FOR_CONTACT_C.'</b>'.$tab[$i][$j]['value'];
}
+ $tab[$i][$j]['order'] = false;
}
}
}
diff --git a/apps/maarch_entreprise/template/documents_list_search_adv.html b/apps/maarch_entreprise/template/documents_list_search_adv.html
index e8d541fb6a1..2761b298c77 100755
--- a/apps/maarch_entreprise/template/documents_list_search_adv.html
+++ b/apps/maarch_entreprise/template/documents_list_search_adv.html
@@ -76,14 +76,14 @@ Mods
<span style="text-align:center;flex:1;">
##defineLang|_CREATION_DATE##<br/>##sortColumn|creation_date##
</span>
- <span style="text-align:center;flex:1;">
+ <span style="text-align:center;flex:2;">
##defineLang|_ASSIGNEE## - ##defineLang|_REDACTOR## / ##defineLang|_ENTITY##<br/>##sortColumn|dest_user## / ##sortColumn|entity_label##
</span>
- <span style="text-align:center;flex:1;">
+ <span style="text-align:center;flex:2;">
##defineLang|_TYPE##<br/>##sortColumn|type_label##
</span>
<span style="text-align:center;flex:1;">
- ##defineLang|_DEST_USER## - ##defineLang|_SHIPPER##<br/>##sortColumn|real_dest##
+ ##defineLang|_DEST_USER## / ##defineLang|_SHIPPER##<br/>
</span>
</div>
</th>
--
GitLab