diff --git a/apps/maarch_entreprise/documents_list_copies.php b/apps/maarch_entreprise/documents_list_copies.php index 775c75072074fd8fef7093e2c9f96dab1a25385f..de81f18fcc45599171aa6ebe52fef06f7d2f1a1b 100755 --- a/apps/maarch_entreprise/documents_list_copies.php +++ b/apps/maarch_entreprise/documents_list_copies.php @@ -154,10 +154,21 @@ if (!empty($order_field) && !empty($order)) { $list->setOrder(); $list->setOrderField($arr_order[0]); } - if ($_SESSION['current_basket']['basket_res_order'] == 'alt_identifier') { - $orderstr = 'order by order_alphanum(alt_identifier)'.' desc'; + $basket_res_order = explode(' ', $_SESSION['current_basket']['basket_res_order']); + if ($basket_res_order[0] == 'alt_identifier') { + $orderstr = 'order by order_alphanum(alt_identifier)'; + if (empty($basket_res_order[1])) { + $orderstr .= 'desc'; + } else { + $orderstr .= $basket_res_order[1]; + } } else { - $orderstr = 'order by '.$_SESSION['current_basket']['basket_res_order'].' desc'; + $orderstr = 'order by '.$_SESSION['current_basket']['basket_res_order'].' '; + if (empty($basket_res_order[1])) { + $orderstr .= 'desc'; + } else { + $orderstr .= $basket_res_order[1]; + } } $_SESSION['last_order_basket'] = $orderstr; } else { diff --git a/apps/maarch_entreprise/documents_list_with_attachments.php b/apps/maarch_entreprise/documents_list_with_attachments.php index c992f3db8a822f0c89914b8deb0ec70e3b1f6446..fe2a2a8dd2ac203fec021f01cab85d6a57a027aa 100755 --- a/apps/maarch_entreprise/documents_list_with_attachments.php +++ b/apps/maarch_entreprise/documents_list_with_attachments.php @@ -154,10 +154,21 @@ if (!empty($order_field) && !empty($order)) { $list->setOrder(); $list->setOrderField($arr_order[0]); } - if ($_SESSION['current_basket']['basket_res_order'] == 'alt_identifier') { - $orderstr = 'order by order_alphanum(alt_identifier)'; + $basket_res_order = explode(' ', $_SESSION['current_basket']['basket_res_order']); + if ($basket_res_order[0] == 'alt_identifier') { + $orderstr = 'order by order_alphanum(alt_identifier) '; + if (empty($basket_res_order[1])) { + $orderstr .= 'desc'; + } else { + $orderstr .= $basket_res_order[1]; + } } else { - $orderstr = 'order by '.$_SESSION['current_basket']['basket_res_order']; + $orderstr = 'order by '.$_SESSION['current_basket']['basket_res_order'].' '; + if (empty($basket_res_order[1])) { + $orderstr .= 'desc'; + } else { + $orderstr .= $basket_res_order[1]; + } } $_SESSION['last_order_basket'] = $orderstr; } else { diff --git a/modules/visa/documents_list_with_signatory.php b/modules/visa/documents_list_with_signatory.php index 7811ae0a39faf26598d008f24d65b1d0fe00d402..0d7d502944c7b1702fe198ab6c99853667447e75 100755 --- a/modules/visa/documents_list_with_signatory.php +++ b/modules/visa/documents_list_with_signatory.php @@ -153,10 +153,21 @@ if (!empty($order_field) && !empty($order)) { $list->setOrder(); $list->setOrderField($arr_order[0]); } - if ($_SESSION['current_basket']['basket_res_order'] == 'alt_identifier') { - $orderstr = 'order by order_alphanum(alt_identifier)'.' desc'; + $basket_res_order = explode(' ', $_SESSION['current_basket']['basket_res_order']); + if ($basket_res_order[0] == 'alt_identifier') { + $orderstr = 'order by order_alphanum(alt_identifier) '; + if (empty($basket_res_order[1])) { + $orderstr .= 'desc'; + } else { + $orderstr .= $basket_res_order[1]; + } } else { - $orderstr = 'order by '.$_SESSION['current_basket']['basket_res_order'].' desc'; + $orderstr = 'order by '.$_SESSION['current_basket']['basket_res_order'].' '; + if (empty($basket_res_order[1])) { + $orderstr .= 'desc'; + } else { + $orderstr .= $basket_res_order[1]; + } } $_SESSION['last_order_basket'] = $orderstr; } else {