From 573c8488c1222b9831f492d63b2ce665df44e873 Mon Sep 17 00:00:00 2001
From: Todd Dembrey <todd.dembrey@torchbox.com>
Date: Tue, 21 Aug 2018 09:39:25 +0100
Subject: [PATCH] Updates to admin for wagtail 2.2
---
opentech/apply/funds/edit_handlers.py | 2 +-
.../apply/funds/templates/funds/admin/parent_chooser.html | 5 ++---
2 files changed, 3 insertions(+), 4 deletions(-)
diff --git a/opentech/apply/funds/edit_handlers.py b/opentech/apply/funds/edit_handlers.py
index 6cfbc90e7..cedb0ef8d 100644
--- a/opentech/apply/funds/edit_handlers.py
+++ b/opentech/apply/funds/edit_handlers.py
@@ -90,7 +90,7 @@ class ReadOnlyInlinePanel(ReadOnlyPanel):
def on_instance_bound(self):
values = getattr(self.instance, self.attr).all()
child_panel = self.get_child_edit_handler()
- self.children = [child_panel.bind_to_instance(value, form=self.form) for value in values]
+ self.children = [child_panel.bind_to_instance(value, form=self.form, request=self.request) for value in values]
class FilteredFieldPanel(FieldPanel):
diff --git a/opentech/apply/funds/templates/funds/admin/parent_chooser.html b/opentech/apply/funds/templates/funds/admin/parent_chooser.html
index c12721b11..83f4c44b0 100644
--- a/opentech/apply/funds/templates/funds/admin/parent_chooser.html
+++ b/opentech/apply/funds/templates/funds/admin/parent_chooser.html
@@ -4,13 +4,12 @@
{% block content %}
<div>
{% block header %}
- {% include "modeladmin/includes/breadcrumb.html" %}
- {% include "wagtailadmin/shared/header.html" with title=view.get_page_title subtitle=view.get_page_subtitle icon=view.header_icon %}
+ {% include "modeladmin/includes/header_with_breadcrumb.html" with title=view.get_page_title subtitle=view.get_page_subtitle icon=view.header_icon tabbed=True %}
{% endblock %}
<div class="nice-padding">
<h2>{% blocktrans %}Choose a Fund{% endblocktrans %}</h2>
- <p>{% blocktrans %}Rounds must be associated with a Fund. For which Fund are you creating a new Round for?{% endblocktrans %}</p>
+ <p>{% blocktrans %}Rounds must be associated with a Fund or RFP. What are you creating a new Round for?{% endblocktrans %}</p>
<form action="" method="post" novalidate>
{% csrf_token %}
--
GitLab