From 7e84ccc6069701721a25583a8ec09d3e1f9e35c2 Mon Sep 17 00:00:00 2001 From: Henrik Levkowetz Date: Tue, 30 Oct 2012 22:13:37 +0000 Subject: [PATCH] Tweaked the changelog presentation to work irrespective of current directory, and give a sensible 404 if the changelog can't be found. - Legacy-Id: 4972 --- ietf/release/views.py | 7 ++++++- ietf/settings.py | 1 + ietf/templates/base.html | 2 +- 3 files changed, 8 insertions(+), 2 deletions(-) diff --git a/ietf/release/views.py b/ietf/release/views.py index bbf2e6aa8..dbafd2363 100644 --- a/ietf/release/views.py +++ b/ietf/release/views.py @@ -3,12 +3,17 @@ import os from django.template import RequestContext from django.shortcuts import render_to_response +from django.conf import settings +from django.http import Http404 import changelog def release(request, version=None): entries = {} - log_entries = changelog.parse("changelog") + if os.path.exists(settings.CHANGELOG_PATH): + log_entries = changelog.parse(settings.CHANGELOG_PATH) + else: + raise Http404() next = None for entry in log_entries: if next: diff --git a/ietf/settings.py b/ietf/settings.py index f89f1c70c..0195916dc 100644 --- a/ietf/settings.py +++ b/ietf/settings.py @@ -302,6 +302,7 @@ BIBXML_BASE_PATH = '/a/www/ietf-ftp/xml2rfc' # Timezone files for iCalendar TZDATA_ICS_PATH = '/www/ietf-datatracker/tz/ics/' +CHANGELOG_PATH = '/www/ietf-datatracker/web/changelog' # Put SECRET_KEY in here, or any other sensitive or site-specific # changes. DO NOT commit settings_local.py to svn. diff --git a/ietf/templates/base.html b/ietf/templates/base.html index c277fef63..0ed8ba14b 100644 --- a/ietf/templates/base.html +++ b/ietf/templates/base.html @@ -77,7 +77,7 @@ IETF.user_groups = {{ user|user_roles_json }};
{% if version_num %} -Version {{ version_num }}, {{revision_date}} +Version {{ version_num }}, {{revision_date}}
{% endif %} Report a bug