Hopiu/wagtail
1
0
Fork 0
mirror of https://github.com/Hopiu/wagtail.git synced 2026-05-21 05:21:54 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Update *_chooser_panel.html templates so that they don't have to be passed an is_chosen flag

Browse source
This commit is contained in:
Matt Westcott 2015-02-06 15:52:40 +00:00
parent 932f532b80
commit 55c585d03e
9 changed files with 9 additions and 27 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
wagtail/wagtailadmin/edit_handlers.py
View file

@ -499,7 +499,7 @@ class BaseChooserPanel(BaseFieldPanel):
context = {
'field': self.bound_field,
self.object_type_name: instance_obj,
'is_chosen': bool(instance_obj),
'is_chosen': bool(instance_obj), # DEPRECATED - passed to templates for backwards compatibility only
}
return mark_safe(render_to_string(self.field_template, context))

2
wagtail/wagtailadmin/templates/wagtailadmin/edit_handlers/chooser_panel.html
View file

@ -10,7 +10,7 @@
{% block form_field %}
<div id="{{ field.id_for_label }}-chooser" class="chooser {% block chooser_class %}page-chooser{% endblock %} {% if not is_chosen %}blank{% endif %}">
<div id="{{ field.id_for_label }}-chooser" class="chooser {% block chooser_class %}page-chooser{% endblock %} {% if not field.value %}blank{% endif %}">
<div class="chosen">
{% block chosen_state_view %}{% endblock %}

2
wagtail/wagtailadmin/templates/wagtailadmin/pages/copy.html
View file

@ -15,7 +15,7 @@
{% include "wagtailadmin/shared/field_as_li.html" with field=form.new_slug %}
<li class="{% if form.new_parent_page.field.required %}required{% endif %}">
{% include "wagtailadmin/edit_handlers/page_chooser_panel.html" with field=form.new_parent_page page=parent_page is_chosen=True only %}
{% include "wagtailadmin/edit_handlers/page_chooser_panel.html" with field=form.new_parent_page page=parent_page only %}
</li>
{% if form.copy_subpages %}

6
wagtail/wagtailsearch/templates/wagtailsearch/editorspicks/includes/editorspicks_form.html
View file

@ -10,11 +10,7 @@
<legend>{% trans "Promoted search result" %}</legend>
<ul class="fields">
<li class="model_choice_field">
{% if form.instance.page %}
{% include "wagtailadmin/edit_handlers/page_chooser_panel.html" with field=form.page page=form.instance.page is_chosen=True only %}
{% else %}
{% include "wagtailadmin/edit_handlers/page_chooser_panel.html" with field=form.page is_chosen=False only %}
{% endif %}
{% include "wagtailadmin/edit_handlers/page_chooser_panel.html" with field=form.page page=form.instance.page only %}
</li>
<li class="char_field">
{% include "wagtailadmin/shared/field.html" with field=form.description only %}

6
wagtail/wagtailsites/templates/wagtailsites/create.html
View file

@ -17,11 +17,7 @@
{% include "wagtailadmin/shared/field_as_li.html" with field=form.port %}
<li>
{% if form.instance.root_page %}
{% include "wagtailadmin/edit_handlers/page_chooser_panel.html" with field=form.root_page page=form.instance.root_page is_chosen=True only %}
{% else %}
{% include "wagtailadmin/edit_handlers/page_chooser_panel.html" with field=form.root_page is_chosen=False only %}
{% endif %}
{% include "wagtailadmin/edit_handlers/page_chooser_panel.html" with field=form.root_page page=form.instance.root_page only %}
</li>
{% include "wagtailadmin/shared/field_as_li.html" with field=form.is_default_site %}

6
wagtail/wagtailsites/templates/wagtailsites/edit.html
View file

@ -18,11 +18,7 @@
{% include "wagtailadmin/shared/field_as_li.html" with field=form.port %}
<li>
{% if form.instance.root_page %}
{% include "wagtailadmin/edit_handlers/page_chooser_panel.html" with field=form.root_page page=form.instance.root_page is_chosen=True only %}
{% else %}
{% include "wagtailadmin/edit_handlers/page_chooser_panel.html" with field=form.root_page is_chosen=False only %}
{% endif %}
{% include "wagtailadmin/edit_handlers/page_chooser_panel.html" with field=form.root_page page=form.instance.root_page only %}
</li>
{% include "wagtailadmin/shared/field_as_li.html" with field=form.is_default_site %}

4
wagtail/wagtailsnippets/edit_handlers.py
View file

@ -28,14 +28,12 @@ class BaseSnippetChooserPanel(BaseChooserPanel):
return cls._content_type
def render_as_field(self, show_help_text=True):
def render_as_field(self):
instance_obj = self.get_chosen_item()
return mark_safe(render_to_string(self.field_template, {
'field': self.bound_field,
self.object_type_name: instance_obj,
'snippet_type_name': self.snippet_type_name,
'is_chosen': bool(instance_obj),
'show_help_text': show_help_text,
}))

2
wagtail/wagtailsnippets/templates/wagtailsnippets/edit_handlers/snippet_chooser_panel.html
View file

@ -4,5 +4,5 @@
{% block chooser_class %}snippet-chooser{% endblock %}
{% block chosen_state_view %}
<span class="title">{% if is_chosen %}{{ item }}{% endif %}</span>
<span class="title">{{ item }}</span>
{% endblock %}

6
wagtail/wagtailusers/templates/wagtailusers/groups/includes/page_permissions_form.html
View file

@ -1,11 +1,7 @@
{% load i18n %}
<td>
{% if form.instance.page %}
{% include "wagtailadmin/edit_handlers/page_chooser_panel.html" with field=form.page page=form.instance.page is_chosen=True only %}
{% else %}
{% include "wagtailadmin/edit_handlers/page_chooser_panel.html" with field=form.page is_chosen=False only %}
{% endif %}
{% include "wagtailadmin/edit_handlers/page_chooser_panel.html" with field=form.page page=form.instance.page only %}
</td>
<td>
{% include "wagtailadmin/edit_handlers/field_panel_field.html" with field=form.permission_type only %}