From 6804bfcde531141f82c3518ca85b5d6aeaca17e7 Mon Sep 17 00:00:00 2001
From: "kevin.dezaphi" <kevin.dezaphi@maarch.org>
Date: Fri, 5 Oct 2018 15:26:38 +0200
Subject: [PATCH] FEAT #8406 fix alt_identifier in basket view
---
apps/maarch_entreprise/documents_list_copies.php | 6 +-----
apps/maarch_entreprise/documents_list_with_attachments.php | 6 +-----
2 files changed, 2 insertions(+), 10 deletions(-)
diff --git a/apps/maarch_entreprise/documents_list_copies.php b/apps/maarch_entreprise/documents_list_copies.php
index f84cb007c29..2b9d1e2d5c8 100755
--- a/apps/maarch_entreprise/documents_list_copies.php
+++ b/apps/maarch_entreprise/documents_list_copies.php
@@ -142,11 +142,7 @@ if (!empty($order_field) && !empty($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') {
- $orderstr = 'order by order_alphanum(alt_identifier)'.' '.$_SESSION['save_list']['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'])) {
diff --git a/apps/maarch_entreprise/documents_list_with_attachments.php b/apps/maarch_entreprise/documents_list_with_attachments.php
index d1aa03cd60f..3f5b7d1b101 100755
--- a/apps/maarch_entreprise/documents_list_with_attachments.php
+++ b/apps/maarch_entreprise/documents_list_with_attachments.php
@@ -142,11 +142,7 @@ if (!empty($order_field) && !empty($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') {
- $orderstr = 'order by order_alphanum(alt_identifier)'.' '.$_SESSION['save_list']['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