[evolvis-commits] r18010: - Fixed sorting Bugs. This depends on the Artifact fix in Revision 18009

messer at evolvis.org messer at evolvis.org
Fri Jan 13 14:24:01 CET 2012


Author: messer
Date: 2012-01-13 14:24:00 +0100 (Fri, 13 Jan 2012)
New Revision: 18010

Modified:
   branches/messer-51/src/common/advanced_search/ASFusionForgeParser.class.php
   branches/messer-51/src/www/tracker/browse.php
Log:
- Fixed sorting Bugs. This depends on the Artifact fix in Revision 18009

Modified: branches/messer-51/src/common/advanced_search/ASFusionForgeParser.class.php
===================================================================
--- branches/messer-51/src/common/advanced_search/ASFusionForgeParser.class.php	2012-01-13 13:21:18 UTC (rev 18009)
+++ branches/messer-51/src/common/advanced_search/ASFusionForgeParser.class.php	2012-01-13 13:24:00 UTC (rev 18010)
@@ -336,7 +336,11 @@
 		}
 
                 if($this->getParam('_sort_col') !== null && $this->getParam('_sort_ord') !== null) {
-                    sortArtifactList ($artifacts, $this->getParam('_sort_col'), $this->getParam('_sort_ord')) ;
+                    if($this->getParam('_sort_col') == 'id') {
+                        sortArtifactList ($artifacts, 'artifact_id', $this->getParam('_sort_ord')) ;
+                    } else {
+                        sortArtifactList ($artifacts, $this->getParam('_sort_col'), $this->getParam('_sort_ord')) ;
+                    }
                 }
                 
 		return $artifacts;

Modified: branches/messer-51/src/www/tracker/browse.php
===================================================================
--- branches/messer-51/src/www/tracker/browse.php	2012-01-13 13:21:18 UTC (rev 18009)
+++ branches/messer-51/src/www/tracker/browse.php	2012-01-13 13:24:00 UTC (rev 18010)
@@ -100,7 +100,9 @@
 	$_sort_ord = 'DESC';
 }
 $_sort_col = getStringFromRequest('_sort_col',$_sort_col);
+$_adv_sort_col = getStringFromRequest('_sort_col',$_sort_col);
 $_sort_ord = getStringFromRequest('_sort_ord',$_sort_ord);
+$_adv_sort_ord = getStringFromRequest('_sort_ord',$_sort_ord);
 $set = getStringFromRequest('set');
 $_assigned_to = getIntFromRequest('_assigned_to');
 $_status = getIntFromRequest('_status');
@@ -180,8 +182,8 @@
 	AStokenizer::$DFIProvider = new FusionForgeDFIProvider();
 
 	$parser->setParam('tracker_id', getIntFromRequest('atid'));
-        $parser->setParam('_sort_col', $_sort_col);
-        $parser->setParam('_sort_ord', $_sort_ord);
+        $parser->setParam('_sort_col', $_adv_sort_col);
+        $parser->setParam('_sort_ord', $_adv_sort_ord);
         
 	$art_arr = $parser->parse($curSearch, $ath);
 



More information about the evolvis-commits mailing list