Merge lp:~stevanr/lava-dashboard/fix-1197338 into lp:lava-dashboard

Proposed by Stevan Radaković
Status: Merged
Merged at revision: 412
Proposed branch: lp:~stevanr/lava-dashboard/fix-1197338
Merge into: lp:lava-dashboard
Diff against target: 49 lines (+5/-16)
1 file modified
dashboard_app/static/dashboard_app/js/image-report.js (+5/-16)
To merge this branch: bzr merge lp:~stevanr/lava-dashboard/fix-1197338
Reviewer Review Type Date Requested Status
Linaro Validation Team Pending
Review via email: mp+172838@code.launchpad.net

Description of the change

Introducing more accurate build number range check.

To post a comment you must log in.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'dashboard_app/static/dashboard_app/js/image-report.js'
2--- dashboard_app/static/dashboard_app/js/image-report.js 2013-07-03 11:42:45 +0000
3+++ dashboard_app/static/dashboard_app/js/image-report.js 2013-07-03 14:51:25 +0000
4@@ -33,12 +33,13 @@
5 function update_filters(column_data, test_run_names) {
6 for (iter in column_data) {
7 build_number = column_data[iter]["number"].split('.')[0];
8+ build_date = column_data[iter]["date"];
9 $("#build_number_start").append($('<option>', {
10- value: build_number,
11+ value: build_date,
12 text: build_number
13 }));
14 $("#build_number_end").append($('<option>', {
15- value: build_number,
16+ value: build_date,
17 text: build_number
18 }));
19 }
20@@ -76,7 +77,7 @@
21 build_number_end = parseInt(build_number_end);
22 }
23
24- if (build_number_start >= build_number_end) {
25+ if (build_number_start > build_number_end) {
26 alert("End build number must be greater then the start build number.");
27 return false;
28 }
29@@ -380,19 +381,7 @@
30 function test_build_number(column_data, iter) {
31 // Test if the build number/date is between specified number/date boundaries.
32
33- build_number = column_data[iter]["number"].split('.')[0];
34- if (isNumeric(build_number)) {
35- build_number = parseInt(build_number);
36- }
37-
38- build_number_start = $("#build_number_start").val();
39- if (isNumeric(build_number_start)) {
40- build_number_start = parseInt(build_number_start);
41- }
42- build_number_end = $("#build_number_end").val();
43- if (isNumeric(build_number_end)) {
44- build_number_end = parseInt(build_number_end);
45- }
46+ build_number = column_data[iter]["date"];
47
48 if (build_number <= $("#build_number_end").val() && build_number >= $("#build_number_start").val()) {
49 return true;

Subscribers

People subscribed via source and target branches