diff --git a/hypha/apply/funds/models/submissions.py b/hypha/apply/funds/models/submissions.py index cbd5e70875..6989488bf1 100644 --- a/hypha/apply/funds/models/submissions.py +++ b/hypha/apply/funds/models/submissions.py @@ -834,7 +834,8 @@ def in_external_review_phase(self): def is_finished(self): accepted = self.status in PHASES_MAPPING['accepted']['statuses'] dismissed = self.status in PHASES_MAPPING['dismissed']['statuses'] - return accepted or dismissed + withdrawn = self.status in PHASES_MAPPING['withdrawn']['statuses'] + return accepted or dismissed or withdrawn # Methods for accessing data on the submission diff --git a/hypha/apply/funds/templates/funds/applicationsubmission_confirm_withdraw.html b/hypha/apply/funds/templates/funds/applicationsubmission_confirm_withdraw.html new file mode 100644 index 0000000000..d0830b01b6 --- /dev/null +++ b/hypha/apply/funds/templates/funds/applicationsubmission_confirm_withdraw.html @@ -0,0 +1,23 @@ +{% extends "base-apply.html" %} +{% load i18n static %} + +{% block title %}{% trans "Withdrawing" %}: {{object.title }}{% endblock %} + +{% block content %} +
+ + + +{% endblock %} diff --git a/hypha/apply/funds/templates/funds/applicationsubmission_detail.html b/hypha/apply/funds/templates/funds/applicationsubmission_detail.html index cba7ed5958..34a5efc8b7 100644 --- a/hypha/apply/funds/templates/funds/applicationsubmission_detail.html +++ b/hypha/apply/funds/templates/funds/applicationsubmission_detail.html @@ -81,6 +81,13 @@