diff --git a/opentech/apply/funds/templates/funds/applicationsubmission_form.html b/opentech/apply/funds/templates/funds/applicationsubmission_form.html index 8cfff8a972948aa669b610746ffce562abcdd34b..bd994fa916fd4bd2b56c267541babcffa7aa3c8f 100644 --- a/opentech/apply/funds/templates/funds/applicationsubmission_form.html +++ b/opentech/apply/funds/templates/funds/applicationsubmission_form.html @@ -39,12 +39,6 @@ {% endfor %} </form> </div> - - <aside class="sidebar"> - {% block determination %} - {% include 'determinations/includes/determination_block.html' with submission=object %} - {% endblock %} - </aside> </div> {% endblock %} diff --git a/opentech/apply/funds/workflow.py b/opentech/apply/funds/workflow.py index 59291fdd156d891b95978928a870023f76645915..6eebaa6925ef4753e2a388e584879467137c4117 100644 --- a/opentech/apply/funds/workflow.py +++ b/opentech/apply/funds/workflow.py @@ -117,6 +117,9 @@ class DefaultPermissions(BasePermissions): def can_staff_review(self, user: 'User') -> bool: return True + def can_staff_edit(self, user: 'User') -> bool: + return True + class ReviewerReviewPermissions(DefaultPermissions): def can_reviewer_review(self, user: 'User') -> bool: @@ -127,6 +130,10 @@ class CanEditPermissions(DefaultPermissions): def can_applicant_edit(self, user: 'User') -> bool: return True + def can_staff_edit(self, user: 'User') -> bool: + # Prevent staff editing whilst with the user for edits + return False + Request = Stage('Request', False)