From 085420920940d82d4f1f45ae4fff6a305b6644dd Mon Sep 17 00:00:00 2001 From: Piotr Ackermann Date: Wed, 21 Jan 2015 11:47:53 +0100 Subject: [PATCH] HUE-2546 | custom date format in beeswax recent queries list --- apps/beeswax/src/beeswax/conf.py | 7 +++++++ apps/beeswax/src/beeswax/views.py | 3 ++- 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/apps/beeswax/src/beeswax/conf.py b/apps/beeswax/src/beeswax/conf.py index e7ffc8e..8c6ac82 100644 --- a/apps/beeswax/src/beeswax/conf.py +++ b/apps/beeswax/src/beeswax/conf.py @@ -95,6 +95,13 @@ THRIFT_VERSION = Config( default=5 ) +SUBMISSION_DATE_FORMAT = Config( + key="submission_date_format", + help=_t("Date format used in recent queries list"), + type=str, + default="%x %X" +) + SSL = ConfigSection( key='ssl', help=_t('SSL configuration for the server.'), diff --git a/apps/beeswax/src/beeswax/views.py b/apps/beeswax/src/beeswax/views.py index ae487d3..d0cd28b 100644 --- a/apps/beeswax/src/beeswax/views.py +++ b/apps/beeswax/src/beeswax/views.py @@ -42,6 +42,7 @@ from desktop.models import Document from jobsub.parameterization import find_variables +import beeswax.conf import beeswax.forms import beeswax.design import beeswax.management.commands.beeswax_install_examples @@ -340,7 +341,7 @@ def massage_query_history_for_json(app_name, query_history): return { 'query': escape(query_history.query), 'timeInMs': time.mktime(query_history.submission_date.timetuple()), - 'timeFormatted': query_history.submission_date.strftime("%x %X"), + 'timeFormatted': query_history.submission_date.strftime(beeswax.conf.SUBMISSION_DATE_FORMAT.get()), 'designUrl': reverse(app_name + ':execute_design', kwargs={'design_id': query_history.design.id}), 'resultsUrl': not query_history.is_failure() and reverse(app_name + ':watch_query_history', kwargs={'query_history_id': query_history.id}) or "" } -- 2.2.2