Added illustration marker to illustration paragraph
authorThierry Florac <thierry.florac@onf.fr>
Mon, 12 Nov 2018 16:56:15 +0100
changeset 1084 6b6a884fa28a
parent 1083 112b6aa11de4
child 1085 85f4724e0c1d
child 1086 3d259e1718ef
Added illustration marker to illustration paragraph
src/pyams_content/component/illustration/zmi/__init__.py
src/pyams_content/component/illustration/zmi/paragraph.py
--- a/src/pyams_content/component/illustration/zmi/__init__.py	Mon Nov 12 16:48:29 2018 +0100
+++ b/src/pyams_content/component/illustration/zmi/__init__.py	Mon Nov 12 16:56:15 2018 +0100
@@ -18,7 +18,7 @@
 
 from pyams_content.component.illustration.interfaces import IBasicIllustration, IBasicIllustrationTarget, \
     IIllustration, IIllustrationTarget, ILinkIllustrationTarget
-from pyams_content.component.illustration.zmi.paragraph import ParagraphContainerIllustrationMarker
+from pyams_content.component.illustration.zmi.paragraph import ParagraphIllustrationMarker
 from pyams_content.component.paragraph import IBaseParagraph
 from pyams_content.component.paragraph.zmi import get_json_paragraph_markers_refresh_event
 from pyams_content.features.renderer.zmi.widget import RendererFieldWidget
@@ -100,12 +100,12 @@
                 if self.getContent().data:
                     events.append(
                         get_json_paragraph_markers_refresh_event(self.context, self.request, self,
-                                                                 ParagraphContainerIllustrationMarker))
+                                                                 ParagraphIllustrationMarker))
                 else:
                     events.append(
                         get_json_paragraph_markers_refresh_event(self.context, self.request, self,
                                                                  EmptyViewlet,
-                                                                 ParagraphContainerIllustrationMarker.marker_type))
+                                                                 ParagraphIllustrationMarker.marker_type))
             events.append(get_json_form_refresh_event(self.context, self.request, self.__class__))
         return output
 
--- a/src/pyams_content/component/illustration/zmi/paragraph.py	Mon Nov 12 16:48:29 2018 +0100
+++ b/src/pyams_content/component/illustration/zmi/paragraph.py	Mon Nov 12 16:56:15 2018 +0100
@@ -141,11 +141,13 @@
 # Paragraph container illustration marker
 #
 
+@viewlet_config(name='illustration', context=IIllustrationParagraph, layer=IPyAMSLayer, view=IParagraphContainerTable,
+                manager=IParagraphTitleToolbar, permission=VIEW_SYSTEM_PERMISSION, weight=5)
 @viewlet_config(name='illustration', context=IBasicIllustrationTarget, layer=IPyAMSLayer, view=IParagraphContainerTable,
                 manager=IParagraphTitleToolbar, permission=VIEW_SYSTEM_PERMISSION, weight=5)
 @template_config(template='templates/paragraph-illustration-icon.pt', layer=IPyAMSLayer)
-class ParagraphContainerIllustrationMarker(Viewlet):
-    """Paragraph container illustration marker column"""
+class ParagraphIllustrationMarker(Viewlet):
+    """Paragraph illustration marker column"""
 
     weight = 5
     action_class = 'action illustration nowrap width-40'
@@ -159,5 +161,5 @@
         if illustration and illustration.data:
             for value in illustration.data.values():
                 if value:
-                    return super(ParagraphContainerIllustrationMarker, self).render()
+                    return super(ParagraphIllustrationMarker, self).render()
         return ''