--- a/src/pyams_content/component/association/zmi/paragraph.py Wed Jun 06 13:32:14 2018 +0200
+++ b/src/pyams_content/component/association/zmi/paragraph.py Fri Jun 08 10:33:23 2018 +0200
@@ -33,13 +33,13 @@
from pyams_content.component.paragraph.zmi import BaseParagraphAJAXAddForm, BaseParagraphAJAXEditForm, \
BaseParagraphAddMenu, BaseParagraphPropertiesEditForm, IParagraphEditFormButtons
from pyams_content.features.renderer.zmi.widget import RendererFieldWidget
+from pyams_form.form import ajax_config
from pyams_pagelet.pagelet import pagelet_config
from pyams_skin.event import get_json_widget_refresh_event
from pyams_utils.adapter import adapter_config
from pyams_utils.traversing import get_parent
from pyams_viewlet.viewlet import viewlet_config
from pyams_zmi.form import AdminDialogAddForm
-from pyramid.view import view_config
from z3c.form import field, button
from zope.interface import implementer
@@ -59,6 +59,8 @@
@pagelet_config(name='add-association-paragraph.html', context=IParagraphContainerTarget, layer=IPyAMSLayer,
permission=MANAGE_CONTENT_PERMISSION)
+@ajax_config(name='add-association-paragraph.json', context=IParagraphContainerTarget, layer=IPyAMSLayer,
+ base=BaseParagraphAJAXAddForm)
class AssociationParagraphAddForm(AdminDialogAddForm):
"""Association paragraph add form"""
@@ -66,7 +68,6 @@
icon_css_class = 'fa fa-fw fa-link'
fields = field.Fields(IAssociationParagraph).select('title', 'renderer')
- ajax_handler = 'add-association-paragraph.json'
edit_permission = MANAGE_CONTENT_PERMISSION
def create(self, data):
@@ -76,14 +77,9 @@
IParagraphContainer(self.context).append(object)
-@view_config(name='add-association-paragraph.json', context=IParagraphContainerTarget, request_type=IPyAMSLayer,
- permission=MANAGE_CONTENT_PERMISSION, renderer='json', xhr=True)
-class AssociationParagraphAJAXAddForm(BaseParagraphAJAXAddForm, AssociationParagraphAddForm):
- """Association paragraph add form, JSON renderer"""
-
-
@pagelet_config(name='properties.html', context=IAssociationParagraph, layer=IPyAMSLayer,
permission=MANAGE_CONTENT_PERMISSION)
+@ajax_config(name='properties.json', context=IAssociationParagraph, layer=IPyAMSLayer, base=BaseParagraphAJAXEditForm)
class AssociationParagraphPropertiesEditForm(BaseParagraphPropertiesEditForm):
"""Association paragraph properties edit form"""
@@ -100,23 +96,17 @@
fields = field.Fields(IAssociationParagraph).select('title', 'renderer')
fields['renderer'].widgetFactory = RendererFieldWidget
- ajax_handler = 'properties.json'
edit_permission = MANAGE_CONTENT_PERMISSION
-@view_config(name='properties.json', context=IAssociationParagraph, request_type=IPyAMSLayer,
- permission=MANAGE_CONTENT_PERMISSION, renderer='json', xhr=True)
-class AssociationParagraphPropertiesAJAXEditForm(BaseParagraphAJAXEditForm, AssociationParagraphPropertiesEditForm):
- """Association paragraph properties edit form, JSON renderer"""
-
-
@adapter_config(context=(IAssociationParagraph, IPyAMSLayer), provides=IParagraphInnerEditor)
+@ajax_config(name='inner-properties.json', context=IAssociationParagraph, layer=IPyAMSLayer,
+ base=BaseParagraphAJAXEditForm)
@implementer(IInnerForm, IAssociationsParentForm)
class AssociationParagraphInnerEditForm(AssociationParagraphPropertiesEditForm):
"""Association paragraph inner edit form"""
legend = None
- ajax_handler = 'inner-properties.json'
@property
def buttons(self):
@@ -125,14 +115,8 @@
else:
return button.Buttons()
-
-@view_config(name='inner-properties.json', context=IAssociationParagraph, request_type=IPyAMSLayer,
- permission=MANAGE_CONTENT_PERMISSION, renderer='json', xhr=True)
-class AssociationParagraphInnerAJAXEditForm(BaseParagraphAJAXEditForm, AssociationParagraphInnerEditForm):
- """Associations paragraph inner edit form, JSON renderer"""
-
def get_ajax_output(self, changes):
- output = super(AssociationParagraphInnerAJAXEditForm, self).get_ajax_output(changes)
+ output = super(self.__class__, self).get_ajax_output(changes)
updated = changes.get(IAssociationParagraph, ())
if 'renderer' in updated:
output.setdefault('events', []).append(get_json_widget_refresh_event(self.context, self.request,