From b7132392d4ed483789bc248691cc99bdf6f10fba Mon Sep 17 00:00:00 2001
From: Frank Duncan <frank@kank.net>
Date: Sat, 15 Apr 2023 09:02:09 -0500
Subject: [PATCH] Change permissions to withdraw to just being an applicant

Based on Review in #3298, the decision was made that an applicant can
withdraw at any time, without edit permissions, and edit permissions
should not be to applicants for their own submissions.

Issue #3296
---
 .../funds/applicationsubmission_detail.html        | 14 ++++++--------
 hypha/apply/funds/views.py                         |  2 +-
 hypha/apply/funds/workflow.py                      |  2 +-
 hypha/static_src/sass/custom/_custom.scss          |  1 -
 4 files changed, 8 insertions(+), 11 deletions(-)

diff --git a/hypha/apply/funds/templates/funds/applicationsubmission_detail.html b/hypha/apply/funds/templates/funds/applicationsubmission_detail.html
index 8950acfc05..7229b20b35 100644
--- a/hypha/apply/funds/templates/funds/applicationsubmission_detail.html
+++ b/hypha/apply/funds/templates/funds/applicationsubmission_detail.html
@@ -111,14 +111,12 @@ <h5>{% blocktrans with stage=object.previous.stage %}Your {{ stage }} applicatio
                                         {% trans "Delete" %}
                                     </a>
                                 {% endif %}
-                                {% if request.user|has_edit_perm:object %}
-                                    {% if request.user.is_applicant %}
-                                        <a
-                                            class="link link--withdraw-submission is-active"
-                                            href="{% url 'funds:submissions:withdraw' object.id %}">
-                                            {% trans "Withdraw" %}
-                                        </a>
-                                    {% endif %}
+                                {% if ENABLE_SUBMISSION_WITHDRAWAL and request.user.is_applicant %}
+                                    <a
+                                        class="link link--withdraw-submission is-active"
+                                        href="{% url 'funds:submissions:withdraw' object.id %}">
+                                        {% trans "Withdraw" %}
+                                    </a>
                                 {% endif %}
                                 {% if request.user|has_edit_perm:object %}
                                     <a
diff --git a/hypha/apply/funds/views.py b/hypha/apply/funds/views.py
index 48e12991d3..7dece24d01 100644
--- a/hypha/apply/funds/views.py
+++ b/hypha/apply/funds/views.py
@@ -1596,7 +1596,7 @@ def withdraw(self, request, *args, **kwargs):
 
         obj = self.get_object()
 
-        if not obj.phase.permissions.can_edit(request.user):
+        if not request.user.is_applicant:
             raise PermissionDenied
 
         withdraw_actions = [action for action in obj.workflow[obj.status].transitions.keys() if 'withdraw' in action]
diff --git a/hypha/apply/funds/workflow.py b/hypha/apply/funds/workflow.py
index f67d0409fe..ef3efadf95 100644
--- a/hypha/apply/funds/workflow.py
+++ b/hypha/apply/funds/workflow.py
@@ -407,7 +407,7 @@ def make_permissions(edit=None, review=None, view=None):
             "display": _("Need screening"),
             "public": _("Application Received"),
             "stage": RequestExt,
-            "permissions": applicant_edit_permissions,
+            "permissions": default_permissions,
         },
         "ext_more_info": {
             "transitions": {
diff --git a/hypha/static_src/sass/custom/_custom.scss b/hypha/static_src/sass/custom/_custom.scss
index cc17f79c15..55e678b65a 100644
--- a/hypha/static_src/sass/custom/_custom.scss
+++ b/hypha/static_src/sass/custom/_custom.scss
@@ -1,6 +1,5 @@
 .link--withdraw-submission {
     margin-right: 1rem;
     padding-right: 1rem;
-    border-right: 2px solid #cfcfcf;
     font-weight: 700;
 }