diff --git a/VIPSWeb/local_settings_sample.py b/VIPSWeb/local_settings_sample.py index 7430b81f537f25acd6e95f8131365437ab5ea249..62e9269669fb2163c878054469be99256e21833a 100755 --- a/VIPSWeb/local_settings_sample.py +++ b/VIPSWeb/local_settings_sample.py @@ -69,7 +69,12 @@ TIME_ZONE = 'Europe/Oslo' # This can be used for testing purposes. Is valid locally for # this web page, not the VIPSLogic application. -SYSTEM_TIME_OFFSET_MONTHS = 0; +SYSTEM_TIME_OFFSET_MONTHS = 0 + +# This is for testing purposes. It overrides SYSTEM_TIME_OFFSET_MONTHS +# It's valid locally for this web page, not the VIPSLogic application +# Ideally, they should be synchronized +SYSTEM_TIME_EXACT = None DATABASES = { 'default': { diff --git a/VIPSWeb/static/js/util.js b/VIPSWeb/static/js/util.js index 760530f24b8a5520c7077ef8b112707843ca5559..fa65784e084a2bf6060fd7060db4c938a9108201 100755 --- a/VIPSWeb/static/js/util.js +++ b/VIPSWeb/static/js/util.js @@ -46,6 +46,10 @@ function buildPathParamString(paramName, values) * @returns the current system time as a Moment.js object */ function getSystemTime(){ + if(settings.systemTimeExact != null) + { + return systemTime = moment(settings.systemTimeExact); + } return systemTime = moment().add(settings.systemTimeOffsetMonths,"months"); } diff --git a/VIPSWeb/templates/base.html b/VIPSWeb/templates/base.html index da90bf70826aa3c1a4b2b2f58369fb9271193be2..20ce4ecd5f64c81a0f6ef15a3048cd3dad9b78bd 100755 --- a/VIPSWeb/templates/base.html +++ b/VIPSWeb/templates/base.html @@ -62,7 +62,7 @@ <span class="icon-bar"></span> </button> <a class="navbar-brand" href="/"><img src="{% static "images/logo_vips_newest.png" %}" alt="VIPS logo"/></a><span id="siteTitle" class="navbar-brand">{{settings.SITE_NAME|safe}}</span> - {% if settings.SYSTEM_TIME_OFFSET_MONTHS != 0 %} + {% if settings.SYSTEM_TIME_OFFSET_MONTHS != 0 or settings.SYSTEM_TIME_EXACT != None %} <span class="navbar-brand" style="margin-left: 0px; padding-left: 0px; padding-top: 15px; font-size: 0.8em">[{% get_system_time "%Y-%m-%d" %}]</span> {% endif %} </div> diff --git a/VIPSWeb/templates/settings.js b/VIPSWeb/templates/settings.js index 611638dd658c17665d63bc2d3cd5107eaf1bfe92..2b34cf74c0d0a66e66618b6c8c02cd97572a1b9c 100755 --- a/VIPSWeb/templates/settings.js +++ b/VIPSWeb/templates/settings.js @@ -31,6 +31,8 @@ var settings = { systemTimeOffsetMonths: {{settings.SYSTEM_TIME_OFFSET_MONTHS}}, + systemTimeExact: {% if settings.SYSTEM_TIME_EXACT == None or settings.SYSTEM_TIME_EXACT|cut:" " == "" %}null{%else%}"{{settings.SYSTEM_TIME_EXACT}}"{%endif%}, + frontpageMessageTagIds: {{settings.FRONTPAGE_MESSAGE_TAG_IDS}}, userUuid: {% if request.session.vips_logic_user == None %}null{% else %}"{{request.session.user_uuid}}"{% endif %}, diff --git a/VIPSWeb/templatetags/template_helper.py b/VIPSWeb/templatetags/template_helper.py index 7157562939286e228256e3fdb1050ab4f0e1a40f..87200f63eb13cc87907c9c21cbe7951a4a663ea2 100755 --- a/VIPSWeb/templatetags/template_helper.py +++ b/VIPSWeb/templatetags/template_helper.py @@ -145,7 +145,10 @@ def get_text_i18n(text_dict): @register.simple_tag def get_system_time(format_string): - time = datetime.now() + relativedelta(months = settings.SYSTEM_TIME_OFFSET_MONTHS) + if(settings.SYSTEM_TIME_EXACT != None and settings.SYSTEM_TIME_EXACT.strip() != ""): + time = datetime.strptime(settings.SYSTEM_TIME_EXACT,"%Y-%m-%d") + else: + time = datetime.now() + relativedelta(months = settings.SYSTEM_TIME_OFFSET_MONTHS) return time.strftime(format_string) @register.filter