move fieldtype filter to wagtailadmin_tags

pull/182/head
Matt Westcott 2014-04-04 14:28:07 +01:00
rodzic 1d092eb1da
commit 0b6c76b008
3 zmienionych plików z 10 dodań i 14 usunięć

Wyświetl plik

@ -1,4 +1,4 @@
{% load fieldtype %} {% load wagtailadmin_tags %}
<li class="{{ field.css_classes }} {{ field|fieldtype }} {% if field.errors %}error{% endif %}"> <li class="{{ field.css_classes }} {{ field|fieldtype }} {% if field.errors %}error{% endif %}">
<div class="field"> <div class="field">
{% if field|fieldtype != "boolean_field" %}{{ field.label_tag }}{% endif %} {% if field|fieldtype != "boolean_field" %}{{ field.label_tag }}{% endif %}

Wyświetl plik

@ -1,13 +0,0 @@
from django import template
from wagtail.wagtailcore.util import camelcase_to_underscore
register = template.Library()
@register.filter
def fieldtype(bound_field):
try:
return camelcase_to_underscore(bound_field.field.__class__.__name__)
except AttributeError:
return ""

Wyświetl plik

@ -6,6 +6,7 @@ from wagtail.wagtailadmin import hooks
from wagtail.wagtailadmin.menu import MenuItem from wagtail.wagtailadmin.menu import MenuItem
from wagtail.wagtailcore.models import get_navigation_menu_items from wagtail.wagtailcore.models import get_navigation_menu_items
from wagtail.wagtailcore.util import camelcase_to_underscore
from wagtail.wagtailsnippets.permissions import user_can_edit_snippets # TODO: reorganise into pluggable architecture so that wagtailsnippets registers its own menu item from wagtail.wagtailsnippets.permissions import user_can_edit_snippets # TODO: reorganise into pluggable architecture so that wagtailsnippets registers its own menu item
@ -83,3 +84,11 @@ def ellipsistrim(value, max_length):
truncd_val = truncd_val[:truncd_val.rfind(" ")] truncd_val = truncd_val[:truncd_val.rfind(" ")]
return truncd_val + "..." return truncd_val + "..."
return value return value
@register.filter
def fieldtype(bound_field):
try:
return camelcase_to_underscore(bound_field.field.__class__.__name__)
except AttributeError:
return ""