src/pyams_content/component/paragraph/contact.py
changeset 555 8e8a14452567
parent 515 a1d5eb955e54
child 575 e61e7effa80a
--- a/src/pyams_content/component/paragraph/contact.py	Thu May 24 10:51:45 2018 +0200
+++ b/src/pyams_content/component/paragraph/contact.py	Fri May 25 08:03:41 2018 +0200
@@ -25,22 +25,22 @@
 
 # import packages
 from pyams_content.component.paragraph import BaseParagraph, BaseParagraphFactory, BaseParagraphContentChecker
-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 zope.interface import implementer, alsoProvides
 from zope.schema.fieldproperty import FieldProperty
-from zope.schema.vocabulary import SimpleVocabulary, SimpleTerm
 
 from pyams_content import _
 
 
 @implementer(IContactParagraph)
-class ContactParagraph(RenderedContentMixin, BaseParagraph):
+@factory_config(provided=IContactParagraph)
+class ContactParagraph(BaseParagraph):
     """Contact paragraph"""
 
     icon_class = 'fa-id-card-o'
@@ -112,16 +112,7 @@
 
 
 @vocabulary_config(name=CONTACT_PARAGRAPH_RENDERERS)
-class ContactParagraphRendererVocabulary(SimpleVocabulary):
+class ContactParagraphRendererVocabulary(RenderersVocabulary):
     """Contact paragraph renderers vocabulary"""
 
-    def __init__(self, context=None):
-        request = check_request()
-        translate = request.localizer.translate
-        registry = request.registry
-        if not IContactParagraph.providedBy(context):
-            context = ContactParagraph()
-        terms = [SimpleTerm(name, title=translate(adapter.label))
-                 for name, adapter in sorted(registry.getAdapters((context, request), IContentRenderer),
-                                             key=lambda x: x[1].weight)]
-        super(ContactParagraphRendererVocabulary, self).__init__(terms)
+    content_interface = IContactParagraph