--- a/src/pyams_content/component/paragraph/video.py Thu May 24 10:51:45 2018 +0200
+++ b/src/pyams_content/component/paragraph/video.py Fri May 25 08:03:41 2018 +0200
@@ -28,23 +28,23 @@
# import packages
from pyams_content.component.paragraph import BaseParagraph, BaseParagraphContentChecker, BaseParagraphFactory
from pyams_content.component.paragraph.html import check_associations
-from pyams_content.features.renderer import RenderedContentMixin, IContentRenderer
+from pyams_content.features.renderer import RenderersVocabulary
from pyams_file.property import FileProperty
from pyams_utils.adapter import adapter_config
+from pyams_utils.factory import factory_config
from pyams_utils.registry import utility_config, get_utility
-from pyams_utils.request import check_request
from pyams_utils.traversing import get_parent
from pyams_utils.vocabulary import vocabulary_config
from pyramid.events import subscriber
from zope.interface import implementer
from zope.schema.fieldproperty import FieldProperty
-from zope.schema.vocabulary import SimpleVocabulary, SimpleTerm
from pyams_content import _
@implementer(IVideoParagraph, IExtFileContainerTarget, ILinkContainerTarget)
-class VideoParagraph(RenderedContentMixin, BaseParagraph):
+@factory_config(provided=IVideoParagraph)
+class VideoParagraph(BaseParagraph):
"""Video paragraph class"""
icon_class = 'fa-film'
@@ -111,16 +111,7 @@
@vocabulary_config(name=VIDEO_PARAGRAPH_RENDERERS)
-class VideoParagraphRendererVocabulary(SimpleVocabulary):
+class VideoParagraphRendererVocabulary(RenderersVocabulary):
"""Video paragraph renderers vocabulary"""
- def __init__(self, context=None):
- request = check_request()
- translate = request.localizer.translate
- registry = request.registry
- if not IVideoParagraph.providedBy(context):
- context = VideoParagraph()
- terms = [SimpleTerm(name, title=translate(adapter.label))
- for name, adapter in sorted(registry.getAdapters((context, request), IContentRenderer),
- key=lambda x: x[1].weight)]
- super(VideoParagraphRendererVocabulary, self).__init__(terms)
+ content_interface = IVideoParagraph