diff --git a/htdocs/lib/settings/ClientList.js b/htdocs/lib/settings/ClientList.js index b4abc438..b896b3fd 100644 --- a/htdocs/lib/settings/ClientList.js +++ b/htdocs/lib/settings/ClientList.js @@ -1,14 +1,14 @@ $.fn.clientList = function() { this.each(function() { $(this).on('click', '.client-ban', function(e) { - $.ajax(document.location.href + "/ban/" + this.value).done(function() { + $.ajax("/ban/" + this.value).done(function() { document.location.reload(); }); return false; }); $(this).on('click', '.client-unban', function(e) { - $.ajax(document.location.href + "/unban/" + this.value).done(function() { + $.ajax("/unban/" + this.value).done(function() { document.location.reload(); }); return false; diff --git a/owrx/http.py b/owrx/http.py index 6245f8ee..16aa6648 100644 --- a/owrx/http.py +++ b/owrx/http.py @@ -107,11 +107,6 @@ class Router(object): StaticRoute("/metrics", MetricsController, options={"action": "prometheusAction"}), StaticRoute("/metrics.json", MetricsController), StaticRoute("/settings", SettingsController), - StaticRoute("/clients", ClientController), - RegexRoute("^/clients/ban/(.+)$", ClientController, options={"action": "ban"}), - RegexRoute("^/clients/unban/(.+)$", ClientController, options={"action": "unban"}), - RegexRoute("^/settings/ban/(.+)$", ClientController, options={"action": "ban"}), - RegexRoute("^/settings/unban/(.+)$", ClientController, options={"action": "unban"}), StaticRoute("/settings/general", GeneralSettingsController), StaticRoute( "/settings/general", GeneralSettingsController, method="POST", options={"action": "processFormData"} @@ -166,6 +161,9 @@ class Router(object): StaticRoute( "/settings/decoding", DecodingSettingsController, method="POST", options={"action": "processFormData"} ), + StaticRoute("/clients", ClientController), + RegexRoute("^/ban/(.+)$", ClientController, options={"action": "ban"}), + RegexRoute("^/unban/(.+)$", ClientController, options={"action": "unban"}), StaticRoute("/login", SessionController, options={"action": "loginAction"}), StaticRoute("/login", SessionController, method="POST", options={"action": "processLoginAction"}), StaticRoute("/logout", SessionController, options={"action": "logoutAction"}),