Skip to content
Snippets Groups Projects
Commit 4f0eb96c authored by Tor-Einar Skog's avatar Tor-Einar Skog
Browse files

Adding the SYSTEM_TIME_EXACT setting for locking VIPSWeb to a fixed

date, for demo purposes
parent ba288f1e
No related branches found
No related tags found
No related merge requests found
......@@ -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': {
......
......@@ -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");
}
......
......@@ -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>
......
......@@ -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 %},
......
......@@ -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
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment