Refs #2742, add idSubtable parameter to imageGraphUrl if it is present in the url.

git-svn-id: http://dev.piwik.org/svn/trunk@6872 59fd770c-687e-43c8-a1e3-f5a4ff64c105

plugins/ImageGraph/ImageGraph.php

@@ -128,6 +128,13 @@ class Piwik_ImageGraph extends Piwik_Plugin
 				$parameters['date'] = $dateForSinglePeriodGraph;
 			}
 			
+			// add the idSubtable if it exists
+			$idSubtable = Piwik_Common::getRequestVar('idSubtable', false);
+			if ($idSubtable !== false)
+			{
+				$parameters['idSubtable'] = $idSubtable;
+			}
+			
 			$report['imageGraphUrl'] = $urlPrefix . Piwik_Url::getQueryStringFromParameters($parameters);
 		}
 			

tests/integration/expected/test_OneVisitorTwoVisits__subtable__API.getProcessedReport_week.xml

@@ -26,7 +26,7 @@
 		</metricsDocumentation>
 		<documentation>This report contains information about the page URLs that have been visited. &lt;br /&gt; The table is organized hierarchically, the URLs are displayed as a folder structure.&lt;br /&gt;Use the plus and minus icons on the left to navigate.</documentation>
 		<actionToLoadSubTables>getPageUrls</actionToLoadSubTables>
-		<imageGraphUrl>index.php?module=API&amp;method=ImageGraph.get&amp;idSite=1&amp;apiModule=Actions&amp;apiAction=getPageUrls&amp;period=week&amp;date=2010-03-06</imageGraphUrl>
+		<imageGraphUrl>index.php?module=API&amp;method=ImageGraph.get&amp;idSite=1&amp;apiModule=Actions&amp;apiAction=getPageUrls&amp;period=week&amp;date=2010-03-06&amp;idSubtable=1650</imageGraphUrl>
 		<uniqueId>Actions_getPageUrls</uniqueId>
 
 	</metadata>

tests/integration/expected/test_twoVisitsWithCustomVariables__subtable__API.getProcessedReport_day.xml

@@ -36,7 +36,7 @@
 			<exit_rate>The percentage of visits that left the website after viewing this page.</exit_rate>
 
 		</metricsDocumentation>
-		<imageGraphUrl>index.php?module=API&amp;method=ImageGraph.get&amp;idSite=1&amp;apiModule=CustomVariables&amp;apiAction=getCustomVariablesValuesFromNameId&amp;period=day&amp;date=2010-01-03</imageGraphUrl>
+		<imageGraphUrl>index.php?module=API&amp;method=ImageGraph.get&amp;idSite=1&amp;apiModule=CustomVariables&amp;apiAction=getCustomVariablesValuesFromNameId&amp;period=day&amp;date=2010-01-03&amp;idSubtable=8</imageGraphUrl>
 		<uniqueId>CustomVariables_getCustomVariablesValuesFromNameId</uniqueId>
 
 	</metadata>