diff --git a/wagtail/wagtailadmin/blocks.py b/wagtail/wagtailadmin/blocks.py index 1db3aa19c..0105e17f6 100644 --- a/wagtail/wagtailadmin/blocks.py +++ b/wagtail/wagtailadmin/blocks.py @@ -112,7 +112,8 @@ class Block(six.with_metaclass(BaseBlock, object)): def set_name(self, name): self.name = name - def get_label(self): + @property + def label(self): return self.meta.label or self.name @property @@ -247,15 +248,15 @@ class TextInputBlock(Block): default = '' def render_form(self, value, prefix='', error=None): - if self.get_label(): + if self.label: return format_html( """ """, - prefix=prefix, label=self.get_label(), value=value + prefix=prefix, label=self.label, value=value ) else: return format_html( """""", - prefix=prefix, label=self.get_label(), value=value + prefix=prefix, label=self.label, value=value ) def value_from_datadict(self, data, files, prefix): @@ -289,10 +290,10 @@ class FieldBlock(Block): #else: # error_html = '' - if self.get_label(): + if self.label: label_html = format_html( """ """, - label_id=widget.id_for_label(prefix), label=self.get_label() + label_id=widget.id_for_label(prefix), label=self.label ) else: label_html = '' @@ -347,10 +348,10 @@ class ChooserBlock(Block): return "Chooser('%s')" % self.definition_prefix def render_form(self, value, prefix='', error=None): - if self.get_label(): + if self.label: return format_html( """ """, - label=self.get_label(), prefix=prefix + label=self.label, prefix=prefix ) else: return format_html( @@ -413,8 +414,8 @@ class BaseStructBlock(Block): # Can these be rendered with a template? - if self.get_label(): - return format_html('