From 03b0828d6447caf69e557135d3250a03ee2a208a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=A9r=C3=B4me=20Schneider?= <jschneider@entrouvert.com>
Date: Mon, 5 Jan 2015 18:20:40 +0100
Subject: [PATCH] toolbar.js: add next_url parameter to
 mandaye_disassociate_logout

Closes #6235
---
 mandaye/static/js/toolbar.js | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/mandaye/static/js/toolbar.js b/mandaye/static/js/toolbar.js
index 9a9238f..843f882 100644
--- a/mandaye/static/js/toolbar.js
+++ b/mandaye/static/js/toolbar.js
@@ -1,9 +1,16 @@
-function mandaye_disassociate_logout(url, account, id)
+function mandaye_disassociate_logout(url, account, id, next_url)
 {
   var r = confirm("Etes-vous sûr de vouloir désassocier le compte " + account + " ?");
+
   if (r == true)
   {
-    window.location = url + "?id=" + id;
+    if (url.search(/\?/) > 0)
+      url += "&id=" + id;
+    else
+      url += "?id=" + id;
+    if (next_url)
+      url += "&next_url=" + encodeURIComponent(next_url);
+    window.location = url;
   }
 }