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

Update to use submission as variable name instead of application

parent bceb4cb4
No related branches found
No related tags found
No related merge requests found
...@@ -23,7 +23,7 @@ class Migration(migrations.Migration): ...@@ -23,7 +23,7 @@ class Migration(migrations.Migration):
('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
('timestamp', models.DateTimeField(auto_now_add=True)), ('timestamp', models.DateTimeField(auto_now_add=True)),
('message', models.TextField()), ('message', models.TextField()),
('application', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='funds.ApplicationSubmission')), ('submission', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='funds.ApplicationSubmission')),
('user', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to=settings.AUTH_USER_MODEL)), ('user', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to=settings.AUTH_USER_MODEL)),
], ],
options={ options={
......
...@@ -5,7 +5,7 @@ from django.db import models ...@@ -5,7 +5,7 @@ from django.db import models
class Activity(models.Model): class Activity(models.Model):
timestamp = models.DateTimeField(auto_now_add=True) timestamp = models.DateTimeField(auto_now_add=True)
user = models.ForeignKey(settings.AUTH_USER_MODEL) user = models.ForeignKey(settings.AUTH_USER_MODEL)
application = models.ForeignKey('funds.ApplicationSubmission') submission = models.ForeignKey('funds.ApplicationSubmission')
message = models.TextField() message = models.TextField()
class Meta: class Meta:
......
...@@ -33,7 +33,7 @@ class CommentFormView(DelegatedCreateView): ...@@ -33,7 +33,7 @@ class CommentFormView(DelegatedCreateView):
def form_valid(self, form): def form_valid(self, form):
form.instance.user = self.request.user form.instance.user = self.request.user
form.instance.application = self.kwargs['application'] form.instance.submission = self.kwargs['submission']
return super().form_valid(form) return super().form_valid(form)
def get_success_url(self): def get_success_url(self):
......
...@@ -54,7 +54,7 @@ class SubmissionDetailView(CommentContextMixin, DetailView): ...@@ -54,7 +54,7 @@ class SubmissionDetailView(CommentContextMixin, DetailView):
def post(self, request, *args, **kwargs): def post(self, request, *args, **kwargs):
self.object = self.get_object() self.object = self.get_object()
kwargs['application'] = self.object kwargs['submission'] = self.object
# Information to pretend we originate from this view # Information to pretend we originate from this view
kwargs['template_names'] = self.get_template_names() kwargs['template_names'] = self.get_template_names()
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment