diff --git a/RIGS/rigboard.py b/RIGS/rigboard.py index de0fa0fe..648377a3 100644 --- a/RIGS/rigboard.py +++ b/RIGS/rigboard.py @@ -296,34 +296,3 @@ class EventRevisions(generic.ListView): } return context - -class EventDiff(generic.TemplateView): - model = reversion.revisions.Revision - template_name = "RIGS/event_detail.html" - - def get_context_data(self, pk, source, dest=None): - model = get_object_or_404(models.Event, pk=pk) - revisions = reversion.get_for_object(model) - source = revisions.get(pk=source) - - if dest: - dest = revisions.get(pk=dest) - else: - dest = reversion.get_for_date(model, datetime.datetime.today()) - - diff = { - 'pk': pk, # need this for the edit button to work - } - for field in source.field_dict: - html = generate_patch_html(source, dest, field, cleanup="semantic") - # tidy up - html = html.replace("¶", "") - diff[field] = html - - - context = { - 'object': diff, - 'event': diff - } - - return context \ No newline at end of file diff --git a/RIGS/templates/RIGS/event_detail.html b/RIGS/templates/RIGS/event_detail.html index d8465be6..5b841cc0 100644 --- a/RIGS/templates/RIGS/event_detail.html +++ b/RIGS/templates/RIGS/event_detail.html @@ -225,8 +225,10 @@ {% endif %} {% endif %} -
Last edited at {{ object.last_edited_at|date:"SHORT_DATETIME_FORMAT" }} - by {{ object.last_edited_by.name }}. +
+ + Lasted edited at {{ object.last_edited_at|date:"SHORT_DATE_FORMAT" }} by {{ object.last_edited_by.name }} +
{% endif %} @@ -238,7 +240,9 @@ {% block footer %}
- Lasted edited at {{ object.last_edited_at|date:"SHORT_DATE_FORMAT" }} by {{ object.last_edited_by.name }} + + Lasted edited at {{ object.last_edited_at|date:"SHORT_DATE_FORMAT" }} by {{ object.last_edited_by.name }} +
diff --git a/RIGS/templates/RIGS/event_version_list.html b/RIGS/templates/RIGS/event_version_list.html index ace69b67..25f27a04 100644 --- a/RIGS/templates/RIGS/event_version_list.html +++ b/RIGS/templates/RIGS/event_version_list.html @@ -26,7 +26,7 @@ {% for version in object_list %} - {{ version.revision.pk }} + {{ version.pk }}|{{ version.revision.pk }} {{ version.revision.date_created }} {{ version.revision.user.name }} {% for key, old, new in version.changes %} diff --git a/RIGS/urls.py b/RIGS/urls.py index fde9a772..c02e74a2 100644 --- a/RIGS/urls.py +++ b/RIGS/urls.py @@ -80,15 +80,9 @@ urlpatterns = patterns('', url(r'^event/archive/$', login_required()(rigboard.EventArchive.as_view()), name='event_archive'), - url(r'^event/(?P\d+)/version/$', + url(r'^event/(?P\d+)/history/$', permission_required_with_403('RIGS.view_event')(rigboard.EventRevisions.as_view()), - name='event_revisions'), - url(r'^event/(?P\d+)/version/(?P\d+)/$', - permission_required_with_403('RIGS.view_event')(rigboard.EventDiff.as_view()), - name='event_diff'), - url(r'^event/(?P\d+)/version/(?P\d+)/(?P\d+)$', - permission_required_with_403('RIGS.view_event')(rigboard.EventDiff.as_view()), - name='event_diff'), + name='event_history'), # Finance url(r'^invoice/$', diff --git a/db.sqlite3 b/db.sqlite3 index a40be46b..bc5f7ea5 100644 Binary files a/db.sqlite3 and b/db.sqlite3 differ