diff --git a/opentech/apply/funds/edit_handlers.py b/opentech/apply/funds/edit_handlers.py index 6cfbc90e76fd507439aacb847c062cd84e86c024..cedb0ef8d71a420200e0b965b0bbe99c0e727e94 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 c12721b1161adad94bc1d4089911afeebc3304fd..83f4c44b0fa53b607b9ce10ceba3ad0bddc026cd 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 %} diff --git a/opentech/images/migrations/0002_customimage_file_hash.py b/opentech/images/migrations/0002_customimage_file_hash.py new file mode 100644 index 0000000000000000000000000000000000000000..8a24374d99544af569bc6153db9ce9b6606e1992 --- /dev/null +++ b/opentech/images/migrations/0002_customimage_file_hash.py @@ -0,0 +1,18 @@ +# Generated by Django 2.0.8 on 2018-08-21 08:33 + +from django.db import migrations, models + + +class Migration(migrations.Migration): + + dependencies = [ + ('images', '0001_initial'), + ] + + operations = [ + migrations.AddField( + model_name='customimage', + name='file_hash', + field=models.CharField(blank=True, editable=False, max_length=40), + ), + ] diff --git a/requirements.txt b/requirements.txt index 744bf872f727c42d86077fc2c3e3c6dec6cf39e9..e3e1b234ef895ffdeeb54e50fabefc4b10f4cd77 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,7 +1,7 @@ -Django==2.0.2 +django~=2.0.0 djangorestframework==3.7.4 django-fsm==2.6.0 -wagtail==2.0 +wagtail~=2.2.0 psycopg2==2.7.3.1 Pillow==4.3.0 django-bleach==0.3.0 @@ -34,4 +34,4 @@ uwsgi==2.0.15 ConcurrentLogHandler==0.9.1 raven==6.9.0 django-storages==1.6.6 -mailchimp3==3.0.4 \ No newline at end of file +mailchimp3==3.0.4