From 8dc18fe33dffcfc4cf21262edf00b0908a680c32 Mon Sep 17 00:00:00 2001
From: sandeepsajan0 <sandeepsajan0@gmail.com>
Date: Thu, 1 Sep 2022 16:20:22 +0530
Subject: [PATCH] Use fundtype url directly in template and update message
---
.../application_projects/project_approval_form.html | 7 +++----
hypha/apply/projects/templatetags/approval_tools.py | 5 -----
2 files changed, 3 insertions(+), 9 deletions(-)
diff --git a/hypha/apply/projects/templates/application_projects/project_approval_form.html b/hypha/apply/projects/templates/application_projects/project_approval_form.html
index 4e2b311a9..419a99ad3 100644
--- a/hypha/apply/projects/templates/application_projects/project_approval_form.html
+++ b/hypha/apply/projects/templates/application_projects/project_approval_form.html
@@ -1,5 +1,5 @@
{% extends "base-apply.html" %}
-{% load i18n static approval_tools %}
+{% load i18n static %}
{% block title %}Editing: {{object.title }}{% endblock %}
{% block content %}
<div class="admin-bar">
@@ -47,9 +47,8 @@
<div class="wrapper wrapper--light-grey-bg wrapper--form wrapper--sidebar">
<div class="wrapper--sidebar--inner">
<p>
- Approval Form is not configured to the fund associated with this project/submission.
- Please configure it first from
- <a href="{% generate_fund_page_admin_url object.submission.page %}" target="_blank">Wagtail Admin</a>.
+ Approval form not configured. Please add an approval form in the
+ <a href="{% url 'funds_fundtype_modeladmin_edit' object.submission.page.id %}" target="_blank">fund settings</a>.
</p>
</div>
</div>
diff --git a/hypha/apply/projects/templatetags/approval_tools.py b/hypha/apply/projects/templatetags/approval_tools.py
index 89f2d7839..707cc0293 100644
--- a/hypha/apply/projects/templatetags/approval_tools.py
+++ b/hypha/apply/projects/templatetags/approval_tools.py
@@ -41,8 +41,3 @@ def user_can_final_approve_project(project, user):
@register.simple_tag
def user_can_edit_project(project, user):
return project.editable_by(user)
-
-
-@register.simple_tag
-def generate_fund_page_admin_url(page):
- return reverse("funds_fundtype_modeladmin_edit", args=[page.id])
--
GitLab