From c5ca9e851c54bc7048d65c045b52ae5d8dac185f Mon Sep 17 00:00:00 2001
From: Parbhat Puri <parbhatpuri17@gmail.com>
Date: Fri, 1 Nov 2019 08:06:53 +0000
Subject: [PATCH] bugfix: correct file path for files in submission
---
opentech/apply/funds/files.py | 8 +++++++-
opentech/apply/funds/models/submissions.py | 2 +-
2 files changed, 8 insertions(+), 2 deletions(-)
diff --git a/opentech/apply/funds/files.py b/opentech/apply/funds/files.py
index 5c05b7034..72e2420fa 100644
--- a/opentech/apply/funds/files.py
+++ b/opentech/apply/funds/files.py
@@ -14,7 +14,13 @@ def generate_submission_file_path(submission_id, field_id, file_name):
class SubmissionStreamFieldFile(StreamFieldFile):
def generate_filename(self):
- return generate_submission_file_path(self.instance.pk, self.field.id, self.name)
+ from opentech.apply.funds.models.submissions import ApplicationRevision
+ submission_id = self.instance.pk
+
+ if isinstance(self.instance, ApplicationRevision):
+ submission_id = self.instance.submission.pk
+
+ return generate_submission_file_path(submission_id, self.field.id, self.name)
@property
def url(self):
diff --git a/opentech/apply/funds/models/submissions.py b/opentech/apply/funds/models/submissions.py
index e4bff5ca8..97b6c9fef 100644
--- a/opentech/apply/funds/models/submissions.py
+++ b/opentech/apply/funds/models/submissions.py
@@ -563,7 +563,7 @@ class ApplicationSubmission(
self.live_revision = revision
self.draft_revision = revision
- self.save()
+ self.save(skip_custom=True)
return revision
return None
--
GitLab