From 7f58bbd3e91448492510ae66d73c3c4184056525 Mon Sep 17 00:00:00 2001 From: Antoine Nguyen Date: Mon, 13 Oct 2014 21:58:36 +0200 Subject: [PATCH] Fix attempt. see #610 --- .../extensions/stats/static/stats/js/stats.js | 20 +++++++++++++++++-- .../stats/templates/stats/index.html | 7 +------ 2 files changed, 19 insertions(+), 8 deletions(-) diff --git a/modoboa/extensions/stats/static/stats/js/stats.js b/modoboa/extensions/stats/static/stats/js/stats.js index 0e9d54f12..753224782 100644 --- a/modoboa/extensions/stats/static/stats/js/stats.js +++ b/modoboa/extensions/stats/static/stats/js/stats.js @@ -7,7 +7,8 @@ Stats.prototype = { defaults: { deflocation: "graphs/", - language: "en" + language: "en", + domain_list_url: null }, initialize: function(options) { @@ -52,7 +53,7 @@ Stats.prototype = { language: this.options.language }); $("#searchquery").autocompleter({ - choices: get_domains_list, + choices: $.proxy(this.get_domain_list, this), choice_selected: $.proxy(this.search_domain, this), empty_choice: $.proxy(this.reset_search, this) }); @@ -71,6 +72,21 @@ Stats.prototype = { $.proxy(this.graphs_cb, this)); }, + /** + * Retrieve a list of domain from the server. + */ + get_domain_list: function() { + var result; + $.ajax({ + url: this.options.domain_list_url, + dataType: "json", + async: false + }).done(function(data) { + result = data; + }); + return result; + }, + change_period: function(e) { e.preventDefault(); var $link = $(e.target); diff --git a/modoboa/extensions/stats/templates/stats/index.html b/modoboa/extensions/stats/templates/stats/index.html index 9aec1d1ef..6df360da5 100644 --- a/modoboa/extensions/stats/templates/stats/index.html +++ b/modoboa/extensions/stats/templates/stats/index.html @@ -6,15 +6,10 @@