From f9ecd4956f4038437b0f8ec9da1ee1fcb3994537 Mon Sep 17 00:00:00 2001 From: Jocelyn Fiat Date: Wed, 9 Sep 2015 23:12:52 +0200 Subject: [PATCH] Keep the until date in the form data, so that new filter will remember the until date. --- modules/recent_changes/cms_recent_changes_module.e | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/modules/recent_changes/cms_recent_changes_module.e b/modules/recent_changes/cms_recent_changes_module.e index b67c4b2..99a78a4 100644 --- a/modules/recent_changes/cms_recent_changes_module.e +++ b/modules/recent_changes/cms_recent_changes_module.e @@ -66,8 +66,10 @@ feature -- Handler l_form: CMS_FORM l_select: WSF_FORM_SELECT l_size_field: WSF_FORM_NUMBER_INPUT + l_date_field: WSF_FORM_HIDDEN_INPUT l_submit: WSF_FORM_SUBMIT_INPUT l_until_date: detachable DATE_TIME + l_until_date_timestamp: INTEGER_64 l_filter_source: detachable READABLE_STRING_8 l_size: NATURAL_32 l_query: STRING @@ -76,7 +78,8 @@ feature -- Handler i: INTEGER do if attached {WSF_STRING} req.query_parameter ("date") as p_until_date then - create htdate.make_from_timestamp (p_until_date.value.to_integer_64) + l_until_date_timestamp := p_until_date.value.to_integer_64 + create htdate.make_from_timestamp (l_until_date_timestamp) l_until_date := htdate.date_time -- l_until_date.second_add (-1) end @@ -138,6 +141,12 @@ feature -- Handler l_size_field.set_size (25) l_size_field.set_label ("Items per page") l_form.extend (l_size_field) + + if l_until_date /= Void then + create l_date_field.make_with_text ("date", l_until_date_timestamp.out) + l_form.extend (l_date_field) + end + create l_submit.make_with_text ("op", "Filter") l_form.extend (l_submit) l_form.extend_html_text ("
")