tyler.durden
/
pandorafms
mirror of https://github.com/pandorafms/pandorafms.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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
This commit is contained in:
zarzuelo 2012-06-20 10:17:09 +00:00
parent 8b1190353d
commit c091275af2
3 changed files with 11 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
pandora_console/ChangeLog
View File

@ -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> 2012-06-20 Miguel de Dios <miguel.dedios@artica.es>
* extensions/net_tools.php: cleaned source code style. * extensions/net_tools.php: cleaned source code style.

2
pandora_console/include/functions_agents.php
View File

@ -465,7 +465,7 @@ function agents_get_agents ($filter = false, $fields = false, $access = 'AR', $o
if (!isset($order['field2'])) { if (!isset($order['field2'])) {
$order = 'ORDER BY '.$order['field'] . ' ' . $order['order']; $order = 'ORDER BY '.$order['field'] . ' ' . $order['order'];
} else { } else {
$order = 'ORDER BY '.$order['field'] . ', '. $order['field2'] . ' '. $order['order']; $order = 'ORDER BY '.$order['field'] . ' ' . $order['order'] . ', ' . $order['field2'];
} }
} }

4
pandora_console/operation/agentes/estado_agente.php
View File

@ -301,11 +301,11 @@ switch ($sortField) {
switch ($sort) { switch ($sort) {
case 'up': case 'up':
$selectLastContactUp = $selected; $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; break;
case 'down': case 'down':
$selectLastContactDown = $selected; $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;
} }
break; break;