From 16cfc9c9baa0b4c46d66192aaace4d07800724bf Mon Sep 17 00:00:00 2001 From: David Taylor Date: Sat, 23 May 2015 17:03:58 +0100 Subject: [PATCH] Removed now un-necessary date format stuff (from revisions stuff) --- PyRIGS/settings.py | 3 --- RIGS/templates/RIGS/activity_stream.html | 2 +- RIGS/templates/RIGS/version_history.html | 2 +- 3 files changed, 2 insertions(+), 5 deletions(-) diff --git a/PyRIGS/settings.py b/PyRIGS/settings.py index 3206a1dc..ed423717 100644 --- a/PyRIGS/settings.py +++ b/PyRIGS/settings.py @@ -186,9 +186,6 @@ USE_TZ = True DATETIME_INPUT_FORMATS = ('%Y-%m-%dT%H:%M','%Y-%m-%dT%H:%M:%S') -RIGS_DATETIME_FORMAT = ('d/m/Y H:i') -RIGS_DATE_FORMAT = ('d/m/Y') - TEMPLATE_CONTEXT_PROCESSORS = ( "django.contrib.auth.context_processors.auth", "django.core.context_processors.debug", diff --git a/RIGS/templates/RIGS/activity_stream.html b/RIGS/templates/RIGS/activity_stream.html index 80bf1381..98ab963f 100644 --- a/RIGS/templates/RIGS/activity_stream.html +++ b/RIGS/templates/RIGS/activity_stream.html @@ -65,7 +65,7 @@ {% for version in object_list %} - {{ version.revision.date_created|date:"RIGS_DATETIME_FORMAT" }} + {{ version.revision.date_created }} {{version.current|to_class_name}} {{ version.new.pk|stringformat:"05d" }} {{ version.version.pk }}|{{ version.revision.pk }} {{ version.revision.user.name }} diff --git a/RIGS/templates/RIGS/version_history.html b/RIGS/templates/RIGS/version_history.html index 1cc3f8cf..163a1ac5 100644 --- a/RIGS/templates/RIGS/version_history.html +++ b/RIGS/templates/RIGS/version_history.html @@ -41,7 +41,7 @@ {% for version in object_list %} {% if version.item_changes or version.field_changes or version.old == None %} - {{ version.revision.date_created|date:"RIGS_DATETIME_FORMAT" }} + {{ version.revision.date_created }} {{ version.version.pk }}|{{ version.revision.pk }} {{ version.revision.user.name }}