From ab6278a26863538bea835ed351ab7e3d5eddbeee Mon Sep 17 00:00:00 2001
From: "kevin.dezaphi" <kevin.dezaphi@maarch.org>
Date: Fri, 5 Oct 2018 16:57:04 +0200
Subject: [PATCH] FEAT #8406 fix alt_identifier in basket view
---
apps/maarch_entreprise/documents_list_copies.php | 1 +
apps/maarch_entreprise/documents_list_with_attachments.php | 1 +
modules/visa/documents_list_with_signatory.php | 2 ++
3 files changed, 4 insertions(+)
diff --git a/apps/maarch_entreprise/documents_list_copies.php b/apps/maarch_entreprise/documents_list_copies.php
index 2b9d1e2d5c8..c3d8af179c4 100755
--- a/apps/maarch_entreprise/documents_list_copies.php
+++ b/apps/maarch_entreprise/documents_list_copies.php
@@ -140,6 +140,7 @@ if (!empty($order_field) && !empty($order)) {
} else {
$orderstr = 'order by '.$order_field.' '.$order;
}
+ $orderstr = 'order by '.str_replace('alt_identifier', 'order_alphanum(alt_identifier)', $_SESSION['current_basket']['basket_res_order']);
$_SESSION['last_order_basket'] = $orderstr;
} elseif (!empty($_SESSION['save_list']['order']) && !empty($_SESSION['save_list']['order_field'])) {
$orderstr = 'order by '.str_replace('alt_identifier', 'order_alphanum(alt_identifier)', $_SESSION['current_basket']['basket_res_order']);
diff --git a/apps/maarch_entreprise/documents_list_with_attachments.php b/apps/maarch_entreprise/documents_list_with_attachments.php
index 3f5b7d1b101..10f3b0effa5 100755
--- a/apps/maarch_entreprise/documents_list_with_attachments.php
+++ b/apps/maarch_entreprise/documents_list_with_attachments.php
@@ -140,6 +140,7 @@ if (!empty($order_field) && !empty($order)) {
} else {
$orderstr = 'order by '.$order_field.' '.$order;
}
+ $orderstr = 'order by '.str_replace('alt_identifier', 'order_alphanum(alt_identifier)', $_SESSION['current_basket']['basket_res_order']);
$_SESSION['last_order_basket'] = $orderstr;
} elseif (!empty($_SESSION['save_list']['order']) && !empty($_SESSION['save_list']['order_field'])) {
$orderstr = 'order by '.str_replace('alt_identifier', 'order_alphanum(alt_identifier)', $_SESSION['current_basket']['basket_res_order']);
diff --git a/modules/visa/documents_list_with_signatory.php b/modules/visa/documents_list_with_signatory.php
index 00342b14cec..b070b33a0ff 100755
--- a/modules/visa/documents_list_with_signatory.php
+++ b/modules/visa/documents_list_with_signatory.php
@@ -139,6 +139,7 @@ if (!empty($order_field) && !empty($order)) {
} else {
$orderstr = 'order by '.$order_field.' '.$order;
}
+ $orderstr = 'order by '.str_replace('alt_identifier', 'order_alphanum(alt_identifier)', $_SESSION['current_basket']['basket_res_order']);
$_SESSION['last_order_basket'] = $orderstr;
} elseif (!empty($_SESSION['save_list']['order']) && !empty($_SESSION['save_list']['order_field'])) {
if ($_SESSION['save_list']['order_field'] == 'alt_identifier') {
@@ -146,6 +147,7 @@ if (!empty($order_field) && !empty($order)) {
} else {
$orderstr = 'order by '.$_SESSION['save_list']['order_field'].' '.$_SESSION['save_list']['order'];
}
+ $orderstr = 'order by '.str_replace('alt_identifier', 'order_alphanum(alt_identifier)', $_SESSION['current_basket']['basket_res_order']);
$_SESSION['last_order_basket'] = $orderstr;
} else {
if (!empty($_SESSION['current_basket']['basket_res_order'])) {
--
GitLab