diff --git a/extensions/amavis_quarantine/static/js/quarantine.js b/extensions/amavis_quarantine/static/js/quarantine.js index 8e34dd589..5a6347947 100644 --- a/extensions/amavis_quarantine/static/js/quarantine.js +++ b/extensions/amavis_quarantine/static/js/quarantine.js @@ -30,7 +30,7 @@ function actioncallback(resp) { } function actionclick(evt) { - new Request.JSON({ + new Request.JSON.mdb({ url: evt.target.get("href"), onSuccess: actioncallback }).get(); diff --git a/extensions/sievefilters/static/js/lib.js b/extensions/sievefilters/static/js/lib.js index d2c19da31..39add7588 100644 --- a/extensions/sievefilters/static/js/lib.js +++ b/extensions/sievefilters/static/js/lib.js @@ -14,7 +14,7 @@ function removefilter(evt) { if (!confirm(gettext("Remove this filter?"))) { return; } - new Request.JSON({ + new Request.JSON.mdb({ url: this.get("href"), onSuccess: function(response) { if (response.status == "ok") { @@ -72,7 +72,7 @@ function loadfs(response) { * (remove, activate) */ function send_command(cmd, extracb) { - new Request.JSON({ + new Request.JSON.mdb({ url: cmd, onSuccess: function(response) { if (response.status == "ko") { @@ -116,7 +116,7 @@ function savefs(evt) { if (!check_prereqs(evt, gettext("Save changes?"))) { return; } - new Request.JSON({ + new Request.JSON.mdb({ url: $("feditor").get("action"), method: $("feditor").get("method"), data: $("feditor").toQueryString(), @@ -177,7 +177,7 @@ function activatefs(evt) { function toggle_filter_state(event) { event.stop(); - new Request.JSON({ + new Request.JSON.mdb({ url: this.get("href"), onSuccess: function(response) { if (response.status == "ok") { @@ -193,7 +193,7 @@ function toggle_filter_state(event) { function move_filter(event) { event.stop(); - new Request.JSON({ + new Request.JSON.mdb({ url: this.get("href"), onSuccess: function(response) { $("filters_list").set("html", response.content); diff --git a/extensions/stats/templates/stats/index.html b/extensions/stats/templates/stats/index.html index 6e33f0f4f..bd041abbd 100644 --- a/extensions/stats/templates/stats/index.html +++ b/extensions/stats/templates/stats/index.html @@ -68,8 +68,8 @@ window.addEvent("domready", function() { if (p == "") { return; } - new Request.JSON({url : url + "?" + p, noCache: true, - onSuccess : getgraph_callback}).get(); + new Request.JSON.mdb({url : url + "?" + p, noCache: true, + onSuccess : getgraph_callback}).get(); }; {% if user.is_superuser %} diff --git a/extensions/webmail/lib.py b/extensions/webmail/lib.py index c823c075b..8d9281820 100644 --- a/extensions/webmail/lib.py +++ b/extensions/webmail/lib.py @@ -691,6 +691,9 @@ def html2plaintext(content): return plaintext def get_current_url(request): + if not request.session.has_key("folder"): + return "" + res = "%s?page=%s" % (request.session["folder"], request.session["page"]) for p in ["criteria", "pattern", "order"]: if p in request.session.keys(): diff --git a/extensions/webmail/static/js/fdmenu.js b/extensions/webmail/static/js/fdmenu.js index 721d69ecd..570d6e80d 100644 --- a/extensions/webmail/static/js/fdmenu.js +++ b/extensions/webmail/static/js/fdmenu.js @@ -46,7 +46,7 @@ var FdMenu = new Class({ if (!confirm(gettext("Delete folder?"))) { return; } - new Request.JSON({ + new Request.JSON.mdb({ url: evt.target.get("href"), method: "GET", onSuccess: function(resp) { diff --git a/extensions/webmail/static/js/webmail.js b/extensions/webmail/static/js/webmail.js index 74d6f283b..bdc67251c 100644 --- a/extensions/webmail/static/js/webmail.js +++ b/extensions/webmail/static/js/webmail.js @@ -219,13 +219,17 @@ function refreshFolder() { profile : "gray", spinner : true }); - new Request.JSON({url: query, noCache : true, onSuccess: function(resp) { - var callback = ($defined(resp.callback)) ? resp.callback : "default"; + new Request.JSON.mdb({ + url: query, + noCache : true, + onSuccess: function(resp) { + var callback = ($defined(resp.callback)) ? resp.callback : "default"; - current_anchor.get_callback(callback)(resp); - infobox.info(gettext("Done")); - infobox.hide(1); - }}).get(); + current_anchor.get_callback(callback)(resp); + infobox.info(gettext("Done")); + infobox.hide(1); + } + }).get(); } /* @@ -240,7 +244,7 @@ function simple_request(url, params) { profile: "gray", spinner: true }); - new Request.JSON({ + new Request.JSON.mdb({ url : url, onSuccess : function(response) { if (response.status == "ok") { diff --git a/extensions/webmail/templates/webmail/attachments.html b/extensions/webmail/templates/webmail/attachments.html index d1660e605..bf4f2e591 100644 --- a/extensions/webmail/templates/webmail/attachments.html +++ b/extensions/webmail/templates/webmail/attachments.html @@ -6,7 +6,7 @@ + {% url django.views.i18n.javascript_catalog as catalog_url %} {% block html_head %}{% endblock %} diff --git a/templates/nlayout.html b/templates/nlayout.html index 3e34463f8..fe931702a 100644 --- a/templates/nlayout.html +++ b/templates/nlayout.html @@ -14,6 +14,7 @@ + {% url django.views.i18n.javascript_catalog as catalog_url %}