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

FIX #5207 fix order by identifier

parent 5757ecbd
No related branches found
No related tags found
No related merge requests found
...@@ -139,14 +139,14 @@ $order = $list->getOrder(); ...@@ -139,14 +139,14 @@ $order = $list->getOrder();
$order_field = $list->getOrderField(); $order_field = $list->getOrderField();
if (!empty($order_field) && !empty($order)) { if (!empty($order_field) && !empty($order)) {
if($_REQUEST['order_field'] == 'alt_identifier'){ 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{ }else{
$orderstr = "order by ".$order_field." ".$order; $orderstr = "order by ".$order_field." ".$order;
} }
$_SESSION['last_order_basket'] = $orderstr; $_SESSION['last_order_basket'] = $orderstr;
}else if(!empty($_SESSION['save_list']['order']) && !empty($_SESSION['save_list']['order_field'])){ }else if(!empty($_SESSION['save_list']['order']) && !empty($_SESSION['save_list']['order_field'])){
if($_SESSION['save_list']['order_field'] == 'alt_identifier'){ 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{ }else{
$orderstr = "order by ".$_SESSION['save_list']['order_field']." ".$_SESSION['save_list']['order']; $orderstr = "order by ".$_SESSION['save_list']['order_field']." ".$_SESSION['save_list']['order'];
} }
......
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