From 1a3038cf8d9b32532f1fe92cd3472b4473ffc0c4 Mon Sep 17 00:00:00 2001 From: Elliot Smith Date: Fri, 15 Jan 2016 13:00:57 +0200 Subject: [PATCH] toastergui: ensure filter_value updates Clicking on the radio button for a date range filter action populates the from and to fields for that action if they are empty. However, because this doesn't fire "change" events, clicking on the radio button doesn't update the filter_value hidden field. This means that the date range action's filter_value parameter isn't set correctly when the filter popup is submitted. Manually call the changeHandler() to set the filter_value whenever the radio for a date range filter is clicked. [YOCTO #8738] Signed-off-by: Elliot Smith Signed-off-by: Ed Bartosh Signed-off-by: Richard Purdie --- lib/toaster/toastergui/static/js/table.js | 32 +++++++++++++---------- 1 file changed, 18 insertions(+), 14 deletions(-) diff --git a/lib/toaster/toastergui/static/js/table.js b/lib/toaster/toastergui/static/js/table.js index c154844820c..a253917b613 100644 --- a/lib/toaster/toastergui/static/js/table.js +++ b/lib/toaster/toastergui/static/js/table.js @@ -488,20 +488,6 @@ function tableInit(ctx){ action.find('[data-date-to-for]').datepicker(options); inputTo.val(selectedTo); - // if the radio button is checked and one or both of the datepickers are - // empty, populate them with today's date - radio.change(function () { - var now = new Date(); - - if (inputFrom.val() === '') { - inputFrom.datepicker('setDate', now); - } - - if (inputTo.val() === '') { - inputTo.datepicker('setDate', now); - } - }); - // set filter_value based on date pickers when // one of their values changes var changeHandler = function () { @@ -529,6 +515,24 @@ function tableInit(ctx){ inputFrom.datepicker('option', 'maxDate', inputTo.val()); }); + // if the radio button is checked and one or both of the datepickers are + // empty, populate them with today's date + radio.change(function () { + var now = new Date(); + + if (inputFrom.val() === '') { + inputFrom.datepicker('setDate', now); + } + + if (inputTo.val() === '') { + inputTo.datepicker('setDate', now); + } + + // setting the date like this doesn't fire the changeHandler to + // update the filter_value, so do that manually instead + changeHandler() + }); + return action; } -- 2.47.3