From 071347fbcb68b42230c226885a01fea0155454ab Mon Sep 17 00:00:00 2001
From: Alex Orluc <alex.orluc@maarch.org>
Date: Fri, 10 Feb 2017 16:35:00 +0100
Subject: [PATCH] FIX #5207 fix order by identifier
---
apps/maarch_entreprise/documents_list_with_attachments.php | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/apps/maarch_entreprise/documents_list_with_attachments.php b/apps/maarch_entreprise/documents_list_with_attachments.php
index 264c345afb5..7598cbe8065 100644
--- a/apps/maarch_entreprise/documents_list_with_attachments.php
+++ b/apps/maarch_entreprise/documents_list_with_attachments.php
@@ -139,14 +139,14 @@ $order = $list->getOrder();
$order_field = $list->getOrderField();
if (!empty($order_field) && !empty($order)) {
if($_REQUEST['order_field'] == 'alt_identifier'){
- $orderstr = "order by regexp_replace(alt_identifier, '[^a-zA-Z]', '', 'g') ".$order.", regexp_replace(alt_identifier, '[^0-9]', '', 'g')::bigint"." ".$order;
+ $orderstr = "order by order_alphanum(alt_identifier)"." ".$order;
}else{
$orderstr = "order by ".$order_field." ".$order;
}
$_SESSION['last_order_basket'] = $orderstr;
}else if(!empty($_SESSION['save_list']['order']) && !empty($_SESSION['save_list']['order_field'])){
if($_SESSION['save_list']['order_field'] == 'alt_identifier'){
- $orderstr = "order by regexp_replace(alt_identifier, '[^a-zA-Z]', '', 'g') ".$_SESSION['save_list']['order'].", regexp_replace(alt_identifier, '[^0-9]', '', 'g')::bigint"." ".$_SESSION['save_list']['order'];
+ $orderstr = "order by order_alphanum(alt_identifier)"." ".$_SESSION['save_list']['order'];
}else{
$orderstr = "order by ".$_SESSION['save_list']['order_field']." ".$_SESSION['save_list']['order'];
}
--
GitLab