From 1276a642b44e2fbfc78efba536c2162fc0956e9d Mon Sep 17 00:00:00 2001
From: Todd Dembrey <todd.dembrey@torchbox.com>
Date: Wed, 28 Feb 2018 17:38:50 +0000
Subject: [PATCH] Update to use submission as variable name instead of
application
---
opentech/apply/activity/migrations/0001_initial.py | 2 +-
opentech/apply/activity/models.py | 2 +-
opentech/apply/activity/views.py | 2 +-
opentech/apply/funds/views.py | 2 +-
4 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/opentech/apply/activity/migrations/0001_initial.py b/opentech/apply/activity/migrations/0001_initial.py
index ca1a25340..785345bcd 100644
--- a/opentech/apply/activity/migrations/0001_initial.py
+++ b/opentech/apply/activity/migrations/0001_initial.py
@@ -23,7 +23,7 @@ class Migration(migrations.Migration):
('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
('timestamp', models.DateTimeField(auto_now_add=True)),
('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)),
],
options={
diff --git a/opentech/apply/activity/models.py b/opentech/apply/activity/models.py
index 9f513a33b..db2dc67ce 100644
--- a/opentech/apply/activity/models.py
+++ b/opentech/apply/activity/models.py
@@ -5,7 +5,7 @@ from django.db import models
class Activity(models.Model):
timestamp = models.DateTimeField(auto_now_add=True)
user = models.ForeignKey(settings.AUTH_USER_MODEL)
- application = models.ForeignKey('funds.ApplicationSubmission')
+ submission = models.ForeignKey('funds.ApplicationSubmission')
message = models.TextField()
class Meta:
diff --git a/opentech/apply/activity/views.py b/opentech/apply/activity/views.py
index f62999303..8c9c54071 100644
--- a/opentech/apply/activity/views.py
+++ b/opentech/apply/activity/views.py
@@ -33,7 +33,7 @@ class CommentFormView(DelegatedCreateView):
def form_valid(self, form):
form.instance.user = self.request.user
- form.instance.application = self.kwargs['application']
+ form.instance.submission = self.kwargs['submission']
return super().form_valid(form)
def get_success_url(self):
diff --git a/opentech/apply/funds/views.py b/opentech/apply/funds/views.py
index 21503631e..27781e881 100644
--- a/opentech/apply/funds/views.py
+++ b/opentech/apply/funds/views.py
@@ -54,7 +54,7 @@ class SubmissionDetailView(CommentContextMixin, DetailView):
def post(self, request, *args, **kwargs):
self.object = self.get_object()
- kwargs['application'] = self.object
+ kwargs['submission'] = self.object
# Information to pretend we originate from this view
kwargs['template_names'] = self.get_template_names()
--
GitLab