From 62d72661c6ac3ef2050f03f7c185bcbc4e435197 Mon Sep 17 00:00:00 2001 From: Sandeep Chauhan <sandeepsajan0@gmail.com> Date: Thu, 28 Sep 2023 13:42:32 +0530 Subject: [PATCH] Add assign approver option to paf detail page (#3533) --- .../project_approval_detail.html | 29 +++++++++++++++++++ hypha/apply/projects/views/project.py | 2 +- 2 files changed, 30 insertions(+), 1 deletion(-) diff --git a/hypha/apply/projects/templates/application_projects/project_approval_detail.html b/hypha/apply/projects/templates/application_projects/project_approval_detail.html index 1b27a780d..3521fa187 100644 --- a/hypha/apply/projects/templates/application_projects/project_approval_detail.html +++ b/hypha/apply/projects/templates/application_projects/project_approval_detail.html @@ -120,6 +120,35 @@ {% trans 'Download as DOCX' %}</a> </div> </div> + {% user_can_update_paf_approvers object user request as can_update_paf_approvers %} + {% if can_update_paf_approvers %} + {% if user != project.lead %} + <a data-fancybox + data-src="#change-assigned-paf-approvers" + class="button button--bottom-space button--primary button--full-width" + href="#"> + {% trans "Change approver" %} + </a> + <div class="modal" id="change-assigned-paf-approvers"> + <h4 class="modal__project-header-bar">{% trans "Change Approver" %}</h4> + <p>{% trans "Selected approver will be notified. On unselecting, every listed member here will be notified." %} </p> + {% trans "Submit" as submit %} + {% include 'funds/includes/delegated_form_base.html' with form=assign_approvers_form value=submit %} + </div> + {% endif %} + {% endif %} + {% user_can_assign_approvers_to_project object user request as can_assign_paf_approvers %} + {% if can_assign_paf_approvers %} + <a data-fancybox data-src="#assign-paf-approvers" class="button button--bottom-space button--primary button--full-width" href="#"> + {% trans "Assign approver" %} + </a> + <div class="modal" id="assign-paf-approvers"> + <h4 class="modal__project-header-bar">{% trans "Assign Approver" %}</h4> + <p>{% trans "Selected approver will be notified. On unselecting, every listed member here will be notified." %} </p> + {% trans "Submit" as submit %} + {% include 'funds/includes/delegated_form_base.html' with form=assign_approvers_form value=submit %} + </div> + {% endif %} {% if can_update_paf_status %} <a data-fancybox data-src="#change-status" class="button button--primary button--full-width {% if user_can_approve %} is-disabled {% endif %}" href="#">{% trans "Update Status" %}</a> <div class="modal" id="change-status"> diff --git a/hypha/apply/projects/views/project.py b/hypha/apply/projects/views/project.py index 84d80769d..fb0521ec9 100644 --- a/hypha/apply/projects/views/project.py +++ b/hypha/apply/projects/views/project.py @@ -1131,7 +1131,7 @@ class ContractDocumentPrivateMediaView(UserPassesTestMixin, PrivateMediaView): @method_decorator(staff_or_finance_or_contracting_required, name="dispatch") class ProjectDetailApprovalView(DelegateableView, DetailView): - form_views = [ChangePAFStatusView] + form_views = [ChangePAFStatusView, UpdateAssignApproversView] model = Project template_name_suffix = "_approval_detail" -- GitLab