From 0aeee48d2e49c55109fc74d21877fd3f9a4f3161 Mon Sep 17 00:00:00 2001 From: Diego Abad Date: Sat, 29 Oct 2016 23:48:13 +0200 Subject: [PATCH] Convert to moment default format of date_format issue5955 review27691002 --- src/common.js | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/src/common.js b/src/common.js index 1e52e66..b60ffd0 100644 --- a/src/common.js +++ b/src/common.js @@ -186,16 +186,16 @@ }; Sao.common.date_format = function(format) { - if (jQuery.isEmptyObject(format) && Sao.Session.current_session) { - var context = Sao.Session.current_session.context; - if (context.locale && context.locale.date) { - format = context.locale.date; + if (jQuery.isEmptyObject(format)) { + format = '%Y-%m-%d'; + if (Sao.Session.current_session) { + var context = Sao.Session.current_session.context; + if (context.locale && context.locale.date) { + format = context.locale.date; + } } } - if (format) { - return Sao.common.moment_format(format); - } - return '%Y-%m-%d'; + return Sao.common.moment_format(format); }; Sao.common.format_time = function(format, date) {