--- a/src/pyams_content/component/gallery/zmi/paragraph.py	Wed Jun 06 13:32:14 2018 +0200
+++ b/src/pyams_content/component/gallery/zmi/paragraph.py	Fri Jun 08 10:33:23 2018 +0200
@@ -34,6 +34,7 @@
     BaseParagraphAddMenu, BaseParagraphPropertiesEditForm, get_json_paragraph_refresh_event, IParagraphEditFormButtons
 from pyams_content.features.renderer.zmi.widget import RendererFieldWidget
 from pyams_content.shared.common.zmi import WfSharedContentPermissionMixin
+from pyams_form.form import ajax_config
 from pyams_pagelet.pagelet import pagelet_config
 from pyams_skin.viewlet.toolbar import ToolbarAction
 from pyams_template.template import template_config
@@ -41,7 +42,6 @@
 from pyams_utils.url import absolute_url
 from pyams_viewlet.viewlet import viewlet_config
 from pyams_zmi.form import AdminDialogAddForm, InnerAdminDisplayForm
-from pyramid.view import view_config
 from z3c.form import field, button
 from zope.interface import implementer, Interface
 
@@ -61,6 +61,8 @@
 
 @pagelet_config(name='add-gallery.html', context=IParagraphContainerTarget, layer=IPyAMSLayer,
                 permission=MANAGE_CONTENT_PERMISSION)
+@ajax_config(name='add-gallery.json', context=IParagraphContainerTarget, layer=IPyAMSLayer,
+             base=BaseParagraphAJAXAddForm)
 class GalleryAddForm(AdminDialogAddForm):
     """Gallery add form"""
 
@@ -68,7 +70,6 @@
     icon_css_class = 'fa fa-fw fa-picture-o'
 
     fields = field.Fields(IGalleryParagraph).omit('__parent__', '__name__', 'visible')
-    ajax_handler = 'add-gallery.json'
     edit_permission = MANAGE_CONTENT_PERMISSION
 
     def updateWidgets(self, prefix=None):
@@ -83,14 +84,10 @@
         IParagraphContainer(self.context).append(object)
 
 
-@view_config(name='add-gallery.json', context=IParagraphContainerTarget, request_type=IPyAMSLayer,
-             permission=MANAGE_CONTENT_PERMISSION, renderer='json', xhr=True)
-class GalleryAJAXAddForm(BaseParagraphAJAXAddForm, GalleryAddForm):
-    """Gallery paragraph add form, JSON renderer"""
-
-
 @pagelet_config(name='properties.html', context=IGalleryParagraph, layer=IPyAMSLayer,
                 permission=MANAGE_CONTENT_PERMISSION)
+@ajax_config(name='properties.json', context=IGalleryParagraph, layer=IPyAMSLayer,
+             base=BaseParagraphAJAXEditForm)
 class GalleryPropertiesEditForm(BaseParagraphPropertiesEditForm):
     """Gallery properties edit form"""
 
@@ -102,7 +99,6 @@
     fields = field.Fields(IGalleryParagraph).omit('__parent__', '__name__', 'visible')
     fields['renderer'].widgetFactory = RendererFieldWidget
 
-    ajax_handler = 'properties.json'
     edit_permission = MANAGE_CONTENT_PERMISSION
 
     def updateWidgets(self, prefix=None):
@@ -110,12 +106,6 @@
         if 'description' in self.widgets:
             self.widgets['description'].widget_css_class = 'textarea'
 
-
-@view_config(name='properties.json', context=IGalleryParagraph, request_type=IPyAMSLayer,
-             permission=MANAGE_CONTENT_PERMISSION, renderer='json', xhr=True)
-class GalleryPropertiesAJAXEditForm(BaseParagraphAJAXEditForm, GalleryPropertiesEditForm):
-    """Gallery paragraph properties edit form, JSON renderer"""
-
     def get_ajax_output(self, changes):
         updated = changes.get(IBaseGallery, ())
         if 'title' in updated:
@@ -124,7 +114,7 @@
                 'events': [get_json_paragraph_refresh_event(self.context, self.request), ]
             }
         else:
-            return super(GalleryPropertiesAJAXEditForm, self).get_ajax_output(changes)
+            return super(self.__class__, self).get_ajax_output(changes)
 
 
 @adapter_config(context=(IGalleryParagraph, IPyAMSLayer), provides=IParagraphInnerEditor)