From c091275af214630e412eadf82c29b5d1bacb7ea9 Mon Sep 17 00:00:00 2001 From: zarzuelo <zarzuelo@gmail.com> Date: Wed, 20 Jun 2012 10:17:09 +0000 Subject: [PATCH] 2012-06-20 Sergio Martin <sergio.martin@artica.es> * include/functions_agents.php operation/agentes/estado_agente.php: Fixed sort actions of agents operation view MERGED FROM 4.0.2 git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@6616 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f --- pandora_console/ChangeLog | 8 ++++++++ pandora_console/include/functions_agents.php | 2 +- pandora_console/operation/agentes/estado_agente.php | 4 ++-- 3 files changed, 11 insertions(+), 3 deletions(-) diff --git a/pandora_console/ChangeLog b/pandora_console/ChangeLog index 185f940129..20315fb99b 100644 --- a/pandora_console/ChangeLog +++ b/pandora_console/ChangeLog @@ -1,3 +1,11 @@ +2012-06-20 Sergio Martin <sergio.martin@artica.es> + + * include/functions_agents.php + operation/agentes/estado_agente.php: Fixed sort actions + of agents operation view + + MERGED FROM 4.0.2 + 2012-06-20 Miguel de Dios <miguel.dedios@artica.es> * extensions/net_tools.php: cleaned source code style. diff --git a/pandora_console/include/functions_agents.php b/pandora_console/include/functions_agents.php index 80f6c9a536..77b2ea4029 100644 --- a/pandora_console/include/functions_agents.php +++ b/pandora_console/include/functions_agents.php @@ -465,7 +465,7 @@ function agents_get_agents ($filter = false, $fields = false, $access = 'AR', $o if (!isset($order['field2'])) { $order = 'ORDER BY '.$order['field'] . ' ' . $order['order']; } else { - $order = 'ORDER BY '.$order['field'] . ', '. $order['field2'] . ' '. $order['order']; + $order = 'ORDER BY '.$order['field'] . ' ' . $order['order'] . ', ' . $order['field2']; } } diff --git a/pandora_console/operation/agentes/estado_agente.php b/pandora_console/operation/agentes/estado_agente.php index 88a8e67db6..f5b39c4b89 100644 --- a/pandora_console/operation/agentes/estado_agente.php +++ b/pandora_console/operation/agentes/estado_agente.php @@ -301,11 +301,11 @@ switch ($sortField) { switch ($sort) { case 'up': $selectLastContactUp = $selected; - $order = array('field' => 'ultimo_contacto', 'field2' => 'nombre COLLATE utf8_general_ci', 'order' => 'ASC'); + $order = array('field' => 'ultimo_contacto', 'field2' => 'nombre COLLATE utf8_general_ci', 'order' => 'DESC'); break; case 'down': $selectLastContactDown = $selected; - $order = array('field' => 'ultimo_contacto', 'field2' => 'nombre COLLATE utf8_general_ci', 'order' => 'DESC'); + $order = array('field' => 'ultimo_contacto', 'field2' => 'nombre COLLATE utf8_general_ci', 'order' => 'ASC'); break; } break;