refs #3359 marked some (now unused) methods as deprecated; small improvements

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

4 files changed, 23 insertions, 35 deletions

diff --git a/plugins/Goals/templates/GoalForm.js b/plugins/Goals/templates/GoalForm.js
index 78f4477566..042f8eb95f 100644
--- a/plugins/Goals/templates/GoalForm.js
+++ b/plugins/Goals/templates/GoalForm.js
@@ -113,11 +113,7 @@ function ajaxDeleteGoal(idGoal)
     var ajaxRequest = new ajaxHelper();
     ajaxRequest.addParams(parameters, 'get');
     ajaxRequest.setLoadingElement('#goalAjaxLoading');
-    ajaxRequest.setCallback(
-        function (response) {
-            piwikHelper.ajaxHandleResponse(response, 'goalAjaxLoading', parameters);
-        }
-    );
+    ajaxRequest.setCallback(function(){ location.reload(); });
     ajaxRequest.send(true);
 }
 
@@ -150,11 +146,7 @@ function ajaxAddGoal()
     var ajaxRequest = new ajaxHelper();
     ajaxRequest.addParams(parameters, 'get');
     ajaxRequest.setLoadingElement('#goalAjaxLoading');
-    ajaxRequest.setCallback(
-        function (response) {
-            piwikHelper.ajaxHandleResponse(response, 'goalAjaxLoading', parameters);
-        }
-    );
+    ajaxRequest.setCallback(function(){ location.reload(); });
     ajaxRequest.send(true);
 }
 
diff --git a/plugins/UsersManager/templates/UsersManager.js b/plugins/UsersManager/templates/UsersManager.js
index 17e3ab43c0..6948af6f90 100644
--- a/plugins/UsersManager/templates/UsersManager.js
+++ b/plugins/UsersManager/templates/UsersManager.js
@@ -81,7 +81,6 @@ function sendUpdateUserAccess(login, access, successCallback)
         method: 'UsersManager.setUserAccess'
     }, 'GET');
     ajaxHandler.addParams(parameters, 'POST');
-    ajaxHandler.redirectOnSuccess();
     ajaxHandler.setCallback(successCallback);
     ajaxHandler.setLoadingElement('#ajaxLoadingUsersManagement');
     ajaxHandler.setErrorElement('#ajaxErrorUsersManagement');
@@ -119,29 +118,17 @@ function bindUpdateAccess()
 	// callback called when the ajax request Update the user permissions is successful
 	function successCallback (response)
 	{
-		piwikHelper.hideAjaxLoading();
-		// if the permission couldn't be granted
-		if(response.result == "error") 
-		{
-			piwikHelper.showAjaxError(response.message);
-		}
-		// if the permission change was successful
-		else
-		{
-			piwikHelper.hideAjaxError();
-			
-			$(self).parent().parent().find('.accessGranted')
-				.attr("src","plugins/UsersManager/images/no-access.png" )
-				.attr("class","updateAccess" )
-				.click(bindUpdateAccess)
-				;
-			$(self)
-				.attr('src',"plugins/UsersManager/images/ok.png" )
-				.attr('class',"accessGranted" )
-				;
-			$('#accessUpdated').css('display', 'inline-block');
-			hideAccessUpdated();
-		}
+        $(self).parent().parent().find('.accessGranted')
+            .attr("src","plugins/UsersManager/images/no-access.png" )
+            .attr("class","updateAccess" )
+            .click(bindUpdateAccess)
+            ;
+        $(self)
+            .attr('src',"plugins/UsersManager/images/ok.png" )
+            .attr('class',"accessGranted" )
+            ;
+        $('#accessUpdated').css('display', 'inline-block');
+        hideAccessUpdated();
 	}
 	
 	var idSite = getIdSites();
diff --git a/themes/default/ajaxHelper.js b/themes/default/ajaxHelper.js
index e5c7881983..32c85366de 100644
--- a/themes/default/ajaxHelper.js
+++ b/themes/default/ajaxHelper.js
@@ -147,7 +147,10 @@ function ajaxHelper() {
      */
     this.redirectOnSuccess = function (params) {
         this.setCallback(function(response) {
-            // add updated=1 to the URL so that a "Your changes have been saved" message is displayed
+            // add updated=X to the URL so that a "Your changes have been saved" message is displayed
+            if (typeof params == 'object') {
+                params = piwikHelper.getQueryStringFromParameters(params);
+            }
             var urlToRedirect = piwikHelper.getCurrentQueryStringWithParametersModified(params);
             var updatedUrl = new RegExp('&updated=([0-9]+)');
             var updatedCounter = updatedUrl.exec(urlToRedirect);
diff --git a/themes/default/common.js b/themes/default/common.js
index 8f641e0996..2225740f9b 100644
--- a/themes/default/common.js
+++ b/themes/default/common.js
@@ -190,6 +190,8 @@ var piwikHelper = {
      * @param {string} errorDivID     id of domNode used for error messages
      * @param {object} params         params used for handling response
      * @return {object}
+     * @deprecated sine 1.9.3 - will be removed in 2.0
+     * @see use ajaxHelper for ajax requests
      */
     getStandardAjaxConf: function(loadingDivID, errorDivID, params)
     {
@@ -232,6 +234,8 @@ var piwikHelper = {
      * @param {XMLHttpRequest} deferred
      * @param {string} status
      * @return {void}
+     * @deprecated sine 1.9.3 - will be removed in 2.0
+     * @see use ajaxHelper for ajax requests
      */
     ajaxHandleError: function(deferred, status)
     {
@@ -252,6 +256,8 @@ var piwikHelper = {
      * @param {string} errorDivID
      * @param {object} params
      * @return {void}
+     * @deprecated since 1.9.3 - will be removed in 2.0
+     * @see use ajaxHelper for ajax requests
      */
     ajaxHandleResponse: function(response, loadingDivID, errorDivID, params)
     {