refs #3359 use global ajax method

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

plugins/DBStats/templates/index.tpl

@@ -77,7 +77,7 @@
 			</td>
 			<td>
 				<h2>{'General_Reports'|translate}</h2>
-				<div class="ajaxLoad" href="index.php?module=DBStats&action=getIndividualReportsSummary&viewDataTable=table">
+				<div class="ajaxLoad" action="getIndividualReportsSummary">
 					<span class="loadingPiwik"><img src="themes/default/images/loading-blue.gif" />{'General_LoadingData'|translate}</span>
  				</div>
 			</td>
@@ -95,7 +95,7 @@
 			</td>
 			<td>
 				<h2>{'General_Metrics'|translate}</h2>
-				<div class="ajaxLoad" href="index.php?module=DBStats&action=getIndividualMetricsSummary&viewDataTable=table">
+				<div class="ajaxLoad" action="getIndividualMetricsSummary">
 					<span class="loadingPiwik"><img src="themes/default/images/loading-blue.gif" />{'General_LoadingData'|translate}</span>
 				</div>
 			</td>
@@ -121,29 +121,21 @@
 (function( $ ){
 	$(document).ready(function() {
 		$('.ajaxLoad').each(function() {
-			var self = this,
-				reportUrl = $(this).attr('href');
+			var self = this;
+			var action = $(this).attr('action');
 			
 			// build & execute AJAX request
-			var request =
-			{
-				type: 'GET',
-				url: reportUrl,
-				dataType: 'html',
-				async: true,
-				error: piwikHelper.ajaxHandleError,		// Callback when the request fails
-				data: {
-					idSite: broadcast.getValueFromUrl('idSite'),
-					period: broadcast.getValueFromUrl('period'),
-					date: broadcast.getValueFromUrl('date')
-				},
-				success: function(data) {
-					$('.loadingPiwik', self).hide();
-					$(self).html(data);
-				}
-			};
-			
-			piwikHelper.queueAjaxRequest($.ajax(request));
+            piwikHelper.ajaxCall(
+                    'DBStats',
+                    action,
+                    {viewDataTable: 'table'},
+                    function(data) {
+                        $('.loadingPiwik', self).remove();
+                        $(self).html(data);
+                    },
+                    'html',
+                    true
+            );
 		});
 	});
 })( jQuery );

themes/default/common.js

@@ -141,13 +141,13 @@ var piwikHelper = {
             params.action = action;
 		}
 		
-        params.idSite = params.idSite ? params.idSite : piwik.idSite || '';
-        params.period = params.period ? params.period : piwik.period || '';
+        params.idSite = params.idSite ? params.idSite : piwik.idSite || broadcast.getValueFromUrl('idSite');
+        params.period = params.period ? params.period : piwik.period || broadcast.getValueFromUrl('period');
 		
 		if (!params.date)
 		{
-            params.date = piwik.currentDateString || '';
-			if (params.period == 'range')
+            params.date = piwik.currentDateString || broadcast.getValueFromUrl('date');
+			if (params.period == 'range' && piwik.currentDateString)
 			{
                 params.date = piwik.startDateString + ',' + params.date;
 			}