From: Stephen Finucane Date: Thu, 9 Apr 2020 16:56:44 +0000 (+0100) Subject: models: Trivial post-merge cleanup X-Git-Tag: v3.0.0~39 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=0910f9771113b7b6228b745ba9a74bd77f9b68ea;p=thirdparty%2Fpatchwork.git models: Trivial post-merge cleanup Signed-off-by: Stephen Finucane --- diff --git a/patchwork/models.py b/patchwork/models.py index a5e7bea7..77ab9241 100644 --- a/patchwork/models.py +++ b/patchwork/models.py @@ -357,7 +357,7 @@ class FilenameMixin(object): return fname -class SubmissionMixin(models.Model): +class SubmissionMixin(FilenameMixin, EmailMixin, models.Model): # parent project = models.ForeignKey(Project, on_delete=models.CASCADE) @@ -387,7 +387,7 @@ class SubmissionMixin(models.Model): abstract = True -class Cover(FilenameMixin, EmailMixin, SubmissionMixin): +class Cover(SubmissionMixin): def get_absolute_url(self): return reverse('cover-detail', @@ -414,7 +414,7 @@ class Cover(FilenameMixin, EmailMixin, SubmissionMixin): ] -class Patch(FilenameMixin, EmailMixin, SubmissionMixin): +class Patch(SubmissionMixin): diff = models.TextField(null=True, blank=True) commit_ref = models.CharField(max_length=255, null=True, blank=True)