[Piwik-svn] r406 - trunk/modules

[svnmaster at piwik.org]

Author: matt
Date: 2008-03-23 02:33:50 +0100 (Sun, 23 Mar 2008)
New Revision: 406

Modified:
   trunk/modules/ViewDataTable.php
Log:
- fixing bug recently introduced, tables were not ajaxified anymore

Modified: trunk/modules/ViewDataTable.php
===================================================================
--- trunk/modules/ViewDataTable.php	2008-03-23 01:16:31 UTC (rev 405)
+++ trunk/modules/ViewDataTable.php	2008-03-23 01:33:50 UTC (rev 406)
@@ -214,18 +214,17 @@
 
 	protected function getUniqIdTable()
 	{
+		// the $uniqIdTable variable is used as the DIV ID in the rendered HTML
+		// we use the current Controller action name as it is supposed to be unique in the rendered page 
+		$uniqIdTable = $this->currentControllerName . $this->currentControllerAction;
+		
 		// if we request a subDataTable the $this->currentControllerAction DIV ID is already there in the page
 		// we make the DIV ID really unique by appending the ID of the subtable requested
 		if( $this->idSubtable !== false)
-		{			
-			$uniqIdTable = 'subDataTable_' . $this->idSubtable;
-		}
-		else
 		{
-			// the $uniqIdTable variable is used as the DIV ID in the rendered HTML
-			// we use the current Controller action name as it is supposed to be unique in the rendered page 
-			$uniqIdTable = $this->currentControllerName . $this->currentControllerAction;
+			$uniqIdTable .=  '_' . $this->idSubtable;
 		}
+		
 		return $uniqIdTable;
 	}
 	
@@ -334,6 +333,11 @@
 			$requestString .= '&expanded=1';
 		}
 		
+		if( $this->idSubtable !== false)
+		{
+			$requestString .= '&idSubtable='.$this->idSubtable;
+		}
+		
 		$toSetEventually = array(
 			'filter_limit',
 			'filter_sort_column',