jprdonnelly/redash
1
0
Fork 0
mirror of https://github.com/getredash/redash.git synced 2025-12-25 01:03:20 -05:00
Code Issues Projects Releases Wiki Activity

Refactoring: extract method about date format config

Browse Source
This commit is contained in:
Katsuhiko YOSHIDA
2018-05-03 18:17:02 +09:00
parent 971e501561
commit 813a5db958
1 changed files with 11 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
redash/handlers/authentication.py
View File

@@ -154,6 +154,16 @@ def base_href():
return base_href
def date_format_config():
date_format = current_org.get_setting('date_format')
date_format_list = set(["DD/MM/YY", "MM/DD/YY", "YYYY-MM-DD", settings.DATE_FORMAT])
return {
'dateFormat': date_format,
'dateFormatList': list(date_format_list),
'dateTimeFormat': "{0} HH:mm".format(date_format),
}
def client_config():
if not current_user.is_api_user() and current_user.is_authenticated:
client_config = {
@@ -163,17 +173,11 @@ def client_config():
else:
client_config = {}
date_format = current_org.get_setting('date_format')
date_format_list = set(["DD/MM/YY", "MM/DD/YY", "YYYY-MM-DD", settings.DATE_FORMAT])
defaults = {
'allowScriptsInUserInput': settings.ALLOW_SCRIPTS_IN_USER_INPUT,
'showPermissionsControl': settings.FEATURE_SHOW_PERMISSIONS_CONTROL,
'allowCustomJSVisualizations': settings.FEATURE_ALLOW_CUSTOM_JS_VISUALIZATIONS,
'autoPublishNamedQueries': settings.FEATURE_AUTO_PUBLISH_NAMED_QUERIES,
'dateFormat': date_format,
'dateFormatList': list(date_format_list),
'dateTimeFormat': "{0} HH:mm".format(date_format),
'mailSettingsMissing': settings.MAIL_DEFAULT_SENDER is None,
'dashboardRefreshIntervals': settings.DASHBOARD_REFRESH_INTERVALS,
'queryRefreshIntervals': settings.QUERY_REFRESH_INTERVALS,
@@ -184,6 +188,7 @@ def client_config():
client_config.update({
'basePath': base_href()
})
client_config.update(date_format_config())
return client_config