From ee4fd8c6b9321c3fb6244fe3823099bc1d8cf659 Mon Sep 17 00:00:00 2001
From: Vaibhav Mule <vaibhavmule135@gmail.com>
Date: Mon, 11 May 2020 16:33:51 +0530
Subject: [PATCH] able to save draft applications
---
hypha/apply/funds/models/applications.py | 3 ++-
hypha/apply/funds/models/utils.py | 20 +++++++++++++------
.../templates/funds/application_base.html | 2 +-
3 files changed, 17 insertions(+), 8 deletions(-)
diff --git a/hypha/apply/funds/models/applications.py b/hypha/apply/funds/models/applications.py
index 19f7846b3..a617a41b5 100644
--- a/hypha/apply/funds/models/applications.py
+++ b/hypha/apply/funds/models/applications.py
@@ -356,10 +356,11 @@ class RoundBase(WorkflowStreamForm, SubmittableStreamForm): # type: ignore
# Overriding serve method to pass submission id to get_form method
copy_open_submission = request.GET.get('open_call_submission')
if request.method == 'POST':
+ draft = bool(request.POST.get('draft'))
form = self.get_form(request.POST, request.FILES, page=self, user=request.user)
if form.is_valid():
- form_submission = self.process_form_submission(form)
+ form_submission = self.process_form_submission(form, draft)
return self.render_landing_page(request, form_submission, *args, **kwargs)
else:
form = self.get_form(page=self, user=request.user, submission_id=copy_open_submission)
diff --git a/hypha/apply/funds/models/utils.py b/hypha/apply/funds/models/utils.py
index caa8194a2..18aa1e96e 100644
--- a/hypha/apply/funds/models/utils.py
+++ b/hypha/apply/funds/models/utils.py
@@ -65,14 +65,22 @@ class SubmittableStreamForm(AbstractStreamForm):
def get_submission_class(self):
return self.submission_class
- def process_form_submission(self, form):
+ def process_form_submission(self, form, draft):
if not form.user.is_authenticated:
form.user = None
- return self.get_submission_class().objects.create(
- form_data=form.cleaned_data,
- form_fields=self.get_defined_fields(),
- **self.get_submit_meta_data(user=form.user),
- )
+ if draft:
+ return self.get_submission_class().objects.create(
+ form_data=form.cleaned_data,
+ form_fields=self.get_defined_fields(),
+ **self.get_submit_meta_data(user=form.user),
+ status='draft',
+ )
+ else:
+ return self.get_submission_class().objects.create(
+ form_data=form.cleaned_data,
+ form_fields=self.get_defined_fields(),
+ **self.get_submit_meta_data(user=form.user),
+ )
def get_submit_meta_data(self, **kwargs):
return kwargs
diff --git a/hypha/apply/funds/templates/funds/application_base.html b/hypha/apply/funds/templates/funds/application_base.html
index d9aa80f42..02fdd8bd4 100644
--- a/hypha/apply/funds/templates/funds/application_base.html
+++ b/hypha/apply/funds/templates/funds/application_base.html
@@ -53,7 +53,7 @@
{% endif %}
{% endif %}
{% endfor %}
- <button class="link link--button-tertiary" type="submit" disabled>Save as a draft</button>
+ <input class="link link--button-tertiary" type="submit" value="Save Draft" name="draft" />
<button class="link link--button-secondary" type="submit" disabled>Submit for review</button>
</form>
<p class="wrapper--error message-no-js js-hidden">You must have Javascript enabled to use this form.</p>
--
GitLab