Remove unnecessary references to Submission model

We want to drop this in future changes. Start by removing any
unnecessary references.

Signed-off-by: Stephen Finucane <stephen@that.guru>

diff --git a/patchwork/admin.py b/patchwork/admin.py
index c3d45240f1eb1b8794aa4aade07a81f799451b36..fb798085dce21faa321da62fbac46c848b257bc8 100644 (file)
--- a/patchwork/admin.py
+++ b/patchwork/admin.py
@@ -20,7 +20,6 @@ from patchwork.models import Project
 from patchwork.models import Series
 from patchwork.models import SeriesReference
 from patchwork.models import State
-from patchwork.models import Submission
 from patchwork.models import Tag
 from patchwork.models import UserProfile
 
@@ -76,15 +75,14 @@ class StateAdmin(admin.ModelAdmin):
 admin.site.register(State, StateAdmin)
 
 
-class SubmissionAdmin(admin.ModelAdmin):
+class CoverLetterAdmin(admin.ModelAdmin):
     list_display = ('name', 'submitter', 'project', 'date')
     list_filter = ('project', )
     search_fields = ('name', 'submitter__name', 'submitter__email')
     date_hierarchy = 'date'
 
 
-admin.site.register(Submission, SubmissionAdmin)
-admin.site.register(CoverLetter, SubmissionAdmin)
+admin.site.register(CoverLetter, CoverLetterAdmin)
 
 
 class PatchAdmin(admin.ModelAdmin):

diff --git a/patchwork/views/cover.py b/patchwork/views/cover.py
index 54962abb7682b4fa557b832147fbd9dad7236f69..e90b73735e8967ee993dca5e922574731668776a 100644 (file)
--- a/patchwork/views/cover.py
+++ b/patchwork/views/cover.py
@@ -11,8 +11,8 @@ from django.shortcuts import render
 from django.urls import reverse
 
 from patchwork.models import CoverLetter
+from patchwork.models import Patch
 from patchwork.models import Project
-from patchwork.models import Submission
 from patchwork.views.utils import cover_to_mbox
 
 
@@ -25,9 +25,11 @@ def cover_detail(request, project_id, msgid):
         cover = get_object_or_404(CoverLetter, project_id=project.id,
                                   msgid=db_msgid)
     except Http404 as exc:
-        submissions = Submission.objects.filter(project_id=project.id,
-                                                msgid=db_msgid)
-        if submissions:
+        patches = Patch.objects.filter(
+            project_id=project.id,
+            msgid=db_msgid,
+        )
+        if patches:
             return HttpResponseRedirect(
                 reverse('patch-detail',
                         kwargs={'project_id': project.linkname,

diff --git a/patchwork/views/patch.py b/patchwork/views/patch.py
index 470ad19730fea3a4b438e211bae6d6d3ad74f71c..9fdbbf9bf9da257f80956f42523f848e5a5096a8 100644 (file)
--- a/patchwork/views/patch.py
+++ b/patchwork/views/patch.py
@@ -15,9 +15,9 @@ from django.urls import reverse
 from patchwork.forms import CreateBundleForm
 from patchwork.forms import PatchForm
 from patchwork.models import Bundle
+from patchwork.models import CoverLetter
 from patchwork.models import Patch
 from patchwork.models import Project
-from patchwork.models import Submission
 from patchwork.views import generic_list
 from patchwork.views.utils import patch_to_mbox
 from patchwork.views.utils import series_patch_to_mbox
@@ -42,9 +42,11 @@ def patch_detail(request, project_id, msgid):
     try:
         patch = Patch.objects.get(project_id=project.id, msgid=db_msgid)
     except Patch.DoesNotExist:
-        submissions = Submission.objects.filter(project_id=project.id,
-                                                msgid=db_msgid)
-        if submissions:
+        covers = CoverLetter.objects.filter(
+            project_id=project.id,
+            msgid=db_msgid,
+        )
+        if covers:
             return HttpResponseRedirect(
                 reverse('cover-detail',
                         kwargs={'project_id': project.linkname,