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
=== modified file 'dashboard_app/static/dashboard_app/js/image-report.js'
--- dashboard_app/static/dashboard_app/js/image-report.js 2013-07-03 11:42:45 +0000
+++ dashboard_app/static/dashboard_app/js/image-report.js 2013-07-03 14:51:25 +0000
@@ -33,12 +33,13 @@
33function update_filters(column_data, test_run_names) {33function update_filters(column_data, test_run_names) {
34 for (iter in column_data) {34 for (iter in column_data) {
35 build_number = column_data[iter]["number"].split('.')[0];35 build_number = column_data[iter]["number"].split('.')[0];
36 build_date = column_data[iter]["date"];
36 $("#build_number_start").append($('<option>', {37 $("#build_number_start").append($('<option>', {
37 value: build_number,38 value: build_date,
38 text: build_number39 text: build_number
39 }));40 }));
40 $("#build_number_end").append($('<option>', {41 $("#build_number_end").append($('<option>', {
41 value: build_number,42 value: build_date,
42 text: build_number43 text: build_number
43 }));44 }));
44 }45 }
@@ -76,7 +77,7 @@
76 build_number_end = parseInt(build_number_end);77 build_number_end = parseInt(build_number_end);
77 }78 }
7879
79 if (build_number_start >= build_number_end) {80 if (build_number_start > build_number_end) {
80 alert("End build number must be greater then the start build number.");81 alert("End build number must be greater then the start build number.");
81 return false;82 return false;
82 }83 }
@@ -380,19 +381,7 @@
380function test_build_number(column_data, iter) {381function test_build_number(column_data, iter) {
381 // Test if the build number/date is between specified number/date boundaries.382 // Test if the build number/date is between specified number/date boundaries.
382383
383 build_number = column_data[iter]["number"].split('.')[0];384 build_number = column_data[iter]["date"];
384 if (isNumeric(build_number)) {
385 build_number = parseInt(build_number);
386 }
387
388 build_number_start = $("#build_number_start").val();
389 if (isNumeric(build_number_start)) {
390 build_number_start = parseInt(build_number_start);
391 }
392 build_number_end = $("#build_number_end").val();
393 if (isNumeric(build_number_end)) {
394 build_number_end = parseInt(build_number_end);
395 }
396385
397 if (build_number <= $("#build_number_end").val() && build_number >= $("#build_number_start").val()) {386 if (build_number <= $("#build_number_end").val() && build_number >= $("#build_number_start").val()) {
398 return true;387 return true;

Subscribers

People subscribed via source and target branches