From: Florian G. <re...@us...> - 2008-07-03 23:50:36
|
Update of /cvsroot/perfparse/_perfparse-phpgui In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv23252/phpgui Modified Files: perfparse.php utils.php Log Message: Fixed biug while sorting in raw and bin reports. Added RFS from Christian Viesser about sorting service. Fixed default sort order (ascending hosts). Index: utils.php =================================================================== RCS file: /cvsroot/perfparse/_perfparse-phpgui/utils.php,v retrieving revision 1.49 retrieving revision 1.50 diff -C2 -d -r1.49 -r1.50 *** utils.php 6 May 2008 22:58:19 -0000 1.49 --- utils.php 3 Jul 2008 23:50:43 -0000 1.50 *************** *** 430,434 **** $query.=' order by '.$sorts[0].' '.$sorts[1]; ! // print($query); $res=$db->Execute($query,$bindvars); --- 430,437 ---- $query.=' order by '.$sorts[0].' '.$sorts[1]; ! // RFE from Christian Vieser: Sort service description ! if($sorts[0]!="service_description") { ! $query.=', service_description asc'; ! } $res=$db->Execute($query,$bindvars); Index: perfparse.php =================================================================== RCS file: /cvsroot/perfparse/_perfparse-phpgui/perfparse.php,v retrieving revision 1.64 retrieving revision 1.65 diff -C2 -d -r1.64 -r1.65 *** perfparse.php 6 May 2008 22:58:19 -0000 1.64 --- perfparse.php 3 Jul 2008 23:50:43 -0000 1.65 *************** *** 382,386 **** if(get_request_var('group_id','int','-1') && (array_key_exists($group_id,$groups) || $group_id == 0)) { ! get_request_var('sort','string','host_name.desc'); if ($page == 'all_bin') { --- 382,386 ---- if(get_request_var('group_id','int','-1') && (array_key_exists($group_id,$groups) || $group_id == 0)) { ! get_request_var('sort','string','host_name.asc'); if ($page == 'all_bin') { |