github-jwinterm/modoboa
1
0
Fork 0
mirror of https://github.com/jwinterm/modoboa.git synced 2026-10-18 05:51:26 +02:00
Code Issues Packages Projects Releases Wiki Activity

Fixed maillog tests.

Browse Source
This commit is contained in:
Antoine Nguyen
2021-05-30 10:19:58 +02:00
parent a07d7b906b
commit 74567c0ee5
5 changed files with 28 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files
modoboa/maillog/graphics.py
+2 -2
View File
@@ -149,7 +149,7 @@ class GraphicSet(object):
def get_graphic_names(self):
return [graphic.display_name for graphic in self._graphics]
def get_file_name(self, request):
def get_file_name(self, request, searchq):
"""Return database file name."""
return self.file_name
@@ -158,7 +158,7 @@ class GraphicSet(object):
for graph in self.graphics:
if graphic is None or graphic == graph.display_name:
result[graph.display_name] = {
"title": graph.title,
"title": str(graph.title),
"series": graph.export(rrdfile, start, end)
}
return result
modoboa/maillog/static/maillog/js/graphic.js
+22 -22
View File
@@ -1,10 +1,10 @@
/**
* Creates an instance of ModoChart.
*
*
* @constructor
* @this {ModoChart}
* @param {string} selection add chart to this DOM element.
*
*
*/
function ModoChart(selection) {
var width = 0,
@@ -57,11 +57,11 @@ function ModoChart(selection) {
.on("brush", brushed);
x.domain(
d3.extent(data.curves[0].data.map(function(d) { return d.x * 1000; }))
d3.extent(data.series[0].data.map(function(d) { return d.x * 1000; }))
);
y.domain(
[d3.min(data.curves, function(d) { return d3.min(d.data, function(v) { return v.y; }); }),
d3.max(data.curves, function(d) { return d3.max(d.data, function(v) { return v.y; }); })
[d3.min(data.series, function(d) { return d3.min(d.data, function(v) { return v.y; }); }),
d3.max(data.series, function(d) { return d3.max(d.data, function(v) { return v.y; }); })
]
);
x2.domain(x.domain());
@@ -92,11 +92,11 @@ function ModoChart(selection) {
var curvegroup = focus.append("g")
.attr('clip-path', 'url(#clip)');
var curve = curvegroup.selectAll(".curve")
.data(data.curves)
.data(data.series)
.enter().append("g")
.attr("class", "curve");
var curve2 = context.selectAll(".curve")
.data(data.curves)
.data(data.series)
.enter().append("g")
.attr("class", "curve");
@@ -136,10 +136,10 @@ function ModoChart(selection) {
return area(d.data);
})
.attr("data-legend", function(d) { return d.name; })
.attr("stroke", function(d) { return d.color; })
.attr("stroke", function(d) { return d.backgroundColor; })
.attr("stroke-width", "2px")
.attr("stroke-opacity", 0.8)
.style("fill", function(d) { return d.color; });
.style("fill", function(d) { return d.backgroundColor; });
var xrules = make_x_axis();
@@ -147,7 +147,7 @@ function ModoChart(selection) {
.attr("class", "grid")
.attr("transform", "translate(0," + height + ")")
.call(xrules);
focus.append("g")
focus.append("g")
.attr("class", "grid")
.call(make_y_axis);
focus.append("g")
@@ -161,13 +161,13 @@ function ModoChart(selection) {
rect.on("mouseover", function(d) {
line.style("display", "block");
tooltip.style("display", "block");
data.curves.forEach(function(d, cid) {
data.series.forEach(function(d, cid) {
var display = d3.selectAll("[data-legend='" + d.name + "']")
.style("display");
if (display == "none") {
return;
}
focus.select(".tracker-" + cid).style("display", "block");
focus.select(".tracker-" + cid).style("display", "block");
});
}).on("mousemove", function(d) {
var mousex = d3.mouse(this)[0],
@@ -176,7 +176,7 @@ function ModoChart(selection) {
var text = "";
line.attr("x1", mousex).attr("x2", mousex);
data.curves.forEach(function(d, cid) {
data.series.forEach(function(d, cid) {
var display = d3.selectAll("[data-legend='" + d.name + "']")
.style("display");
if (display == "none") {
@@ -192,7 +192,7 @@ function ModoChart(selection) {
tracker_y = y(point.y);
focus.selectAll(".tracker-" + cid)
.style("fill", d.color)
.style("fill", d.backgroundColor)
.attr("cx", tracker_x)
.attr("cy", tracker_y);
});
@@ -214,15 +214,15 @@ function ModoChart(selection) {
.attr("transform", "translate(50,10)")
.style("font-size", "0.8em")
.call(d3.legend);
curve2.append("path")
.attr("class", "area2")
.attr("d", function(d) { return area2(d.data); })
.attr("stroke", function(d) { return d.color; })
.attr("stroke", function(d) { return d.backgroundColor; })
.attr("stroke-width", "2px")
.attr("stroke-opacity", 0.8)
.attr("data-legend", function(d) { return d.name; })
.style("fill", function(d) { return d.color; });
.style("fill", function(d) { return d.backgroundColor; });
context.append("g")
.attr("class", "x axis")
@@ -279,7 +279,7 @@ function ModoChart(selection) {
/**
* Set or get chart's width.
*
*
* @this {ModoChart}
* @param {integer} value new width.
* @return {number} current width.
@@ -292,7 +292,7 @@ function ModoChart(selection) {
/**
* Set or get chart's height.
*
*
* @this {ModoChart}
* @param {integer} value new height.
* @return {number} current height.
@@ -305,7 +305,7 @@ function ModoChart(selection) {
/**
* Set or get chart's margin.
*
*
* @this {ModoChart}
* @param {Object} value new margin.
* @return {Object} current margin.
@@ -318,12 +318,12 @@ function ModoChart(selection) {
/**
* Compute and return chart's total height.
*
*
* @this {ModoChart}
* @return {integer} total height.
*/
my.totalHeight = function() {
return height + 2 * margin.top
return height + 2 * margin.top
+ 2 * margin.bottom + preview_height
+ brush_height;
};
modoboa/maillog/static/maillog/js/stats.js
+1 -1
View File
@@ -149,7 +149,7 @@ Stats.prototype = {
$.each(data.graphs, $.proxy(function(id, graphdef) {
if (this.charts.hasOwnProperty(id)) {
this.charts[id].update(graphdef);
} else if (graphdef.curves.length) {
} else if (graphdef.series.length) {
var mychart = ModoChart("#gset");
this.charts[id] = mychart;
mychart(graphdef);
modoboa/maillog/tests/test_views.py
+1 -1
View File
@@ -110,7 +110,7 @@ class ViewsTestCase(RunCommandsMixin, ModoTestCase):
url = reverse("maillog:graph_list")
response = self.ajax_get("{}?gset=accountgraphicset".format(url))
data = (
response["graphs"]["accountcreationgraphic"]["curves"][0]["data"])
response["graphs"]["accountcreationgraphic"]["series"][0]["data"])
self.assertEqual(data[-1]["y"], 5.0)
def test_graphs_as_domainadmin(self):
modoboa/maillog/views.py
+2 -1
View File
@@ -55,6 +55,7 @@ def index(request):
@user_passes_test(lambda u: u.role != "SimpleUsers")
def graphs(request):
gset = request.GET.get("gset", None)
searchq = request.GET.get("searchquery", None)
graph_sets = {}
for result in signals.get_graph_sets.send(
sender="index", user=request.user):
@@ -63,7 +64,7 @@ def graphs(request):
raise NotFound(_("Unknown graphic set"))
period = request.GET.get("period", "day")
tplvars = {"graphs": {}, "period": period}
fname = graph_sets[gset].get_file_name(request)
fname = graph_sets[gset].get_file_name(request.user, searchq)
if fname is None:
raise BadRequest(_("Unknown domain"))
tplvars["fname"] = fname