Skip to content
Snippets Groups Projects
Commit 74425b05 authored by Todd Dembrey's avatar Todd Dembrey
Browse files

Add activity list to the detail page

parent 914e74ee
No related branches found
No related tags found
No related merge requests found
{% for event in activity %}
<div>
<p>{{ event.timestamp }}</p>
<p>{{ event.user }}</p>
<p>{{ event.message }}</p>
</div>
{% endfor %}
......@@ -4,9 +4,10 @@ from .forms import CommentForm
from .models import Activity, COMMENT
class CommentContextMixin:
class ActivityContextMixin:
def get_context_data(self, **kwargs):
extra = {
'activity': Activity.activities.filter(submission=self.object),
'comments': Activity.comments.filter(submission=self.object),
CommentFormView.context_name: CommentFormView.form_class(),
}
......@@ -38,4 +39,4 @@ class CommentFormView(DelegatedViewMixin, CreateView):
return super().form_valid(form)
def get_success_url(self):
return self.object.application.get_absolute_url()
return self.object.submission.get_absolute_url()
......@@ -62,6 +62,7 @@
{% endif %}
{% include "activity/include/comment_form.html" %}
{% include "activity/include/comment_list.html" %}
{% include "activity/include/activity_list.html" %}
</aside>
</div>
</div>
......
......@@ -5,7 +5,7 @@ from django.views.generic import DetailView, UpdateView
from django_filters.views import FilterView
from django_tables2.views import SingleTableMixin
from opentech.apply.activity.views import CommentContextMixin, CommentFormView, DelegatedViewMixin
from opentech.apply.activity.views import ActivityContextMixin, CommentFormView, DelegatedViewMixin
from opentech.apply.activity.models import Activity
from .forms import ProgressSubmissionForm
......@@ -70,7 +70,7 @@ class ProgressSubmissionView(DelegatedViewMixin, UpdateView):
return response
class SubmissionDetailView(CommentContextMixin, ProgressContextMixin, DetailView):
class SubmissionDetailView(ActivityContextMixin, ProgressContextMixin, DetailView):
model = ApplicationSubmission
form_views = {
'progress': ProgressSubmissionView,
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment