mirror of
https://github.com/nottinghamtec/PyRIGS.git
synced 2026-01-30 20:02:16 +00:00
Add event history view
This commit is contained in:
@@ -296,34 +296,3 @@ class EventRevisions(generic.ListView):
|
|||||||
}
|
}
|
||||||
|
|
||||||
return context
|
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
|
|
||||||
@@ -225,8 +225,10 @@
|
|||||||
{% endif %}
|
{% endif %}
|
||||||
{% endif %}
|
{% endif %}
|
||||||
</div>
|
</div>
|
||||||
<div>Last edited at {{ object.last_edited_at|date:"SHORT_DATETIME_FORMAT" }}
|
<div>
|
||||||
by {{ object.last_edited_by.name }}.
|
<a href="{% url 'event_history' object.pk %}">
|
||||||
|
Lasted edited at {{ object.last_edited_at|date:"SHORT_DATE_FORMAT" }} by {{ object.last_edited_by.name }}
|
||||||
|
</a>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
{% endif %}
|
{% endif %}
|
||||||
@@ -238,7 +240,9 @@
|
|||||||
{% block footer %}
|
{% block footer %}
|
||||||
<div class="row">
|
<div class="row">
|
||||||
<div class="col-sm-10 align-left">
|
<div class="col-sm-10 align-left">
|
||||||
Lasted edited at {{ object.last_edited_at|date:"SHORT_DATE_FORMAT" }} by {{ object.last_edited_by.name }}
|
<a href="{% url 'event_history' object.pk %}">
|
||||||
|
Lasted edited at {{ object.last_edited_at|date:"SHORT_DATE_FORMAT" }} by {{ object.last_edited_by.name }}
|
||||||
|
</a>
|
||||||
</div>
|
</div>
|
||||||
<div class="col-sm-2">
|
<div class="col-sm-2">
|
||||||
<div class="pull-right">
|
<div class="pull-right">
|
||||||
|
|||||||
@@ -26,7 +26,7 @@
|
|||||||
<tbody>
|
<tbody>
|
||||||
{% for version in object_list %}
|
{% for version in object_list %}
|
||||||
<tr>
|
<tr>
|
||||||
<td>{{ version.revision.pk }}</td>
|
<td>{{ version.pk }}|{{ version.revision.pk }}</td>
|
||||||
<td>{{ version.revision.date_created }}</td>
|
<td>{{ version.revision.date_created }}</td>
|
||||||
<td>{{ version.revision.user.name }}</td>
|
<td>{{ version.revision.user.name }}</td>
|
||||||
<td>{% for key, old, new in version.changes %}
|
<td>{% for key, old, new in version.changes %}
|
||||||
|
|||||||
10
RIGS/urls.py
10
RIGS/urls.py
@@ -80,15 +80,9 @@ urlpatterns = patterns('',
|
|||||||
url(r'^event/archive/$', login_required()(rigboard.EventArchive.as_view()),
|
url(r'^event/archive/$', login_required()(rigboard.EventArchive.as_view()),
|
||||||
name='event_archive'),
|
name='event_archive'),
|
||||||
|
|
||||||
url(r'^event/(?P<pk>\d+)/version/$',
|
url(r'^event/(?P<pk>\d+)/history/$',
|
||||||
permission_required_with_403('RIGS.view_event')(rigboard.EventRevisions.as_view()),
|
permission_required_with_403('RIGS.view_event')(rigboard.EventRevisions.as_view()),
|
||||||
name='event_revisions'),
|
name='event_history'),
|
||||||
url(r'^event/(?P<pk>\d+)/version/(?P<source>\d+)/$',
|
|
||||||
permission_required_with_403('RIGS.view_event')(rigboard.EventDiff.as_view()),
|
|
||||||
name='event_diff'),
|
|
||||||
url(r'^event/(?P<pk>\d+)/version/(?P<source>\d+)/(?P<dest>\d+)$',
|
|
||||||
permission_required_with_403('RIGS.view_event')(rigboard.EventDiff.as_view()),
|
|
||||||
name='event_diff'),
|
|
||||||
|
|
||||||
# Finance
|
# Finance
|
||||||
url(r'^invoice/$',
|
url(r'^invoice/$',
|
||||||
|
|||||||
BIN
db.sqlite3
BIN
db.sqlite3
Binary file not shown.
Reference in New Issue
Block a user