WCM-316: rename teaserText in volume to volume_note

core/src/zeit/content/volume/browser/form.py

@@ -27,7 +27,7 @@ class Base:
         'year',
         'volume',
         'date_digital_published',
-        'teaserText',
+        'volume_note',
         'title',
         'teaser',
         'background_color',
@@ -36,7 +36,7 @@ class Base:
     field_groups = (
         gocept.form.grouped.Fields(
             _('Volume'),
-            ('product', 'year', 'volume', 'date_digital_published', 'teaserText'),
+            ('product', 'year', 'volume', 'date_digital_published', 'volume_note'),
             css_class='column-left',
         ),
         gocept.form.grouped.Fields(

core/src/zeit/content/volume/browser/reference.py

@@ -10,7 +10,7 @@
 
 
 class EditReference(zeit.edit.browser.form.InlineForm):
-    """Display the additional field `teaserText` for references."""
+    """Display the additional field `volume_note` for references."""
 
     legend = ''
 
@@ -19,7 +19,7 @@ class EditReference(zeit.edit.browser.form.InlineForm):
         # support read-only mode, see
         # zeit.content.article.edit.browser.form.FormFields
         render_context=zope.formlib.interfaces.DISPLAY_UNWRITEABLE,
-    ).select('teaserText')
+    ).select('volume_note')
 
     @property
     def prefix(self):

core/src/zeit/content/volume/interfaces.py

@@ -37,7 +37,7 @@ class IVolume(zeit.cms.content.interfaces.IXMLContent):
 
     volume = zope.schema.Int(title=_('Volume'), min=1, max=54)
 
-    teaserText = zope.schema.Text(title=_('Volume text'), required=False, max_length=170)
+    volume_note = zope.schema.Text(title=_('Volume text'), required=False, max_length=170)
 
     date_digital_published = zope.schema.Datetime(title=_('Date of digital publication'))
 
@@ -116,7 +116,7 @@ def content_with_references_for_publishing():
 
 
 class IVolumeReference(zeit.cms.content.interfaces.IReference):
-    teaserText = zope.schema.Text(title=_('Volume text'), required=False, max_length=170)
+    volume_note = zope.schema.Text(title=_('Volume text'), required=False, max_length=170)
 
 
 class ITocConnector(zope.interface.Interface):

core/src/zeit/content/volume/reference.py

@@ -22,9 +22,9 @@ class RelatedReference(zeit.cms.content.reference.Reference):
     grok.provides(zeit.cms.content.interfaces.IReference)
     grok.name('related')
 
-    _teaserText_local = zeit.cms.content.property.ObjectPathAttributeProperty(
-        '.', 'teasertext_local', zeit.content.volume.interfaces.IVolumeReference['teaserText']
+    _volume_note_local = zeit.cms.content.property.ObjectPathAttributeProperty(
+        '.', 'volume_note_local', zeit.content.volume.interfaces.IVolumeReference['volume_note']
     )
-    teaserText = zeit.cms.content.reference.OverridableProperty(
-        zeit.content.volume.interfaces.IVolume['teaserText'], original='target'
+    volume_note = zeit.cms.content.reference.OverridableProperty(
+        zeit.content.volume.interfaces.IVolume['volume_note'], original='target'
     )

core/src/zeit/content/volume/tests/test_reference.py

@@ -13,7 +13,7 @@ def setUp(self):
 
         super().setUp()
         volume = Volume()
-        volume.teaserText = 'original'
+        volume.volume_note = 'original'
         self.repository['testvolume'] = volume
         self.volume = self.repository['testvolume']
 
@@ -31,7 +31,7 @@ def test_reference_honors_ICommonMetadata_xml_format(self):
         volume = Volume()
         volume.year = 2015
         volume.volume = 1
-        volume.teaserText = 'original'
+        volume.volume_note = 'original'
         volume.product = zeit.cms.content.sources.Product('ZEI')
         self.repository['2015'] = Folder()
         self.repository['2015']['01'] = Folder()
@@ -58,16 +58,16 @@ def test_volume_can_be_adapted_to_IReference(self):
         )
         self.assertEqual(True, IVolumeReference.providedBy(reference))
 
-    def test_teasertext_can_be_overridden(self):
+    def test_volume_note_can_be_overridden(self):
         node = zope.component.getAdapter(
             self.volume, zeit.cms.content.interfaces.IXMLReference, name='related'
         )
         source = zeit.content.article.edit.volume.Volume(None, lxml.builder.E.volume())
         reference = zope.component.getMultiAdapter(
             (source, node), zeit.cms.content.interfaces.IReference, name='related'
         )
-        self.assertEqual('original', reference.teaserText)
-        reference.teaserText = 'local'
-        self.assertEqual('local', reference.teaserText)
-        reference.teaserText = None
-        self.assertEqual('original', reference.teaserText)
+        self.assertEqual('original', reference.volume_note)
+        reference.volume_note = 'local'
+        self.assertEqual('local', reference.volume_note)
+        reference.volume_note = None
+        self.assertEqual('original', reference.volume_note)

core/src/zeit/content/volume/tests/test_volume.py

@@ -181,9 +181,9 @@ def test_looks_up_centerpage_for_depent_product_content(self):
         cp = zeit.content.cp.interfaces.ICenterPage(volume)
         self.assertEqual('http://xml.zeit.de/2015/01/index', cp.uniqueId)
 
-    def test_no_teaserText_present_returns_default_string(self):
+    def test_no_volume_note_present_returns_default_string(self):
         volume = zeit.cms.interfaces.ICMSContent('http://xml.zeit.de/2015/01/ausgabe')
-        self.assertEqual('Teäser 01/2015', volume.teaserText)
+        self.assertEqual('Teäser 01/2015', volume.volume_note)
 
     def test_covers_are_published_with_the_volume(self):
         volume = self.repository['2015']['01']['ausgabe']

core/src/zeit/content/volume/volume.py

@@ -71,22 +71,22 @@ def product(self, value):
             return
         self._product_id = value.id if value is not None else None
 
-    _teaserText = zeit.cms.content.dav.DAVProperty(
-        zeit.content.volume.interfaces.IVolume['teaserText'],
+    _volume_note = zeit.cms.content.dav.DAVProperty(
+        zeit.content.volume.interfaces.IVolume['volume_note'],
         zeit.cms.interfaces.DOCUMENT_SCHEMA_NS,
-        'teaserText',
+        'volume_note',
     )
 
     @property
-    def teaserText(self):
-        text = self._teaserText
+    def volume_note(self):
+        text = self._volume_note
         if text is None:
             text = zeit.cms.config.required('zeit.content.volume', 'default-teaser-text')
         return self.fill_template(text)
 
-    @teaserText.setter
-    def teaserText(self, value):
-        self._teaserText = value
+    @volume_note.setter
+    def volume_note(self, value):
+        self._volume_note = value
 
     @property
     def teaserSupertitle(self):  # For display in CP-editor

core/src/zeit/retresco/convert.py

@@ -617,8 +617,8 @@ def __new__(cls, context):
 
     def __call__(self):
         result = {
-            'title': self.context.teaserText or 'Ausgabe',
-            'teaser': self.context.teaserText or 'Ausgabe',
+            'title': self.context.volume_note or 'Ausgabe',
+            'teaser': self.context.volume_note or 'Ausgabe',
         }
         covers = [
             {'id': x.get('id'), 'product_id': x.get('product_id'), 'href': x.get('href')}