--- a/src/pyams_content/shared/blog/zmi/manager.py	Wed Jun 06 13:32:14 2018 +0200
+++ b/src/pyams_content/shared/blog/zmi/manager.py	Fri Jun 08 10:33:23 2018 +0200
@@ -32,7 +32,7 @@
 
 # import packages
 from pyams_content.shared.blog.manager import BlogManager
-from pyams_form.form import AJAXAddForm, AJAXEditForm
+from pyams_form.form import AJAXAddForm, ajax_config
 from pyams_pagelet.pagelet import pagelet_config
 from pyams_skin.table import DefaultElementEditorAdapter
 from pyams_skin.viewlet.menu import MenuItem
@@ -88,6 +88,8 @@
 
 @pagelet_config(name='add-blog-manager.html', context=ISiteRoot, layer=IPyAMSLayer,
                 permission=MANAGE_SITE_ROOT_PERMISSION)
+@ajax_config(name='add-blog-manager.json', context=ISiteRoot, layer=IPyAMSLayer,
+             permission=MANAGE_SITE_ROOT_PERMISSION, base=AJAXAddForm)
 class BlogManagerAddForm(AdminDialogAddForm):
     """Blog manager add form"""
 
@@ -96,7 +98,6 @@
     icon_css_class = 'fa fa-fw fa-tags'
 
     fields = field.Fields(IBlogManager).select('title', 'short_name')
-    ajax_handler = 'add-blog-manager.json'
     edit_permission = None
 
     def create(self, data):
@@ -134,12 +135,6 @@
         event.form.widgets.errors += (Invalid(_("A blog manager is already registered with this name!!")),)
 
 
-@view_config(name='add-blog-manager.json', context=ISiteRoot, request_type=IPyAMSLayer,
-             permission=MANAGE_SITE_ROOT_PERMISSION, renderer='json', xhr=True)
-class BlogManagerAJAXAddForm(AJAXAddForm, BlogManagerAddForm):
-    """Blog manager add form, JSON renderer"""
-
-
 @adapter_config(context=(IBlogManager, IAdminLayer, ISiteTreeTable), provides=ITableElementEditor)
 class BlogManagerTableElementEditor(DefaultElementEditorAdapter):
     """Blog manager table element editor"""
@@ -177,6 +172,7 @@
 
 @pagelet_config(name='workflow-publication.html', context=IBlogManager, layer=IPyAMSLayer,
                 permission=MANAGE_SITE_PERMISSION)
+@ajax_config(name='workflow-publication.json', context=IBlogManager, layer=IPyAMSLayer)
 class BlogManagerWorkflowPublicationEditForm(AdminDialogEditForm):
     """Blog manager workflow publication edit form"""
 
@@ -185,7 +181,6 @@
     legend = _("Update publication dates")
 
     fields = field.Fields(IWorkflowPublicationInfo).select('publication_effective_date', 'publication_expiration_date')
-    ajax_handler = 'workflow-publication.json'
     edit_permission = MANAGE_SITE_PERMISSION
 
     def updateWidgets(self, prefix=None):
@@ -194,9 +189,3 @@
             widget = self.widgets['publication_effective_date']
             if not widget.value:
                 widget.value = tztime(datetime.utcnow()).strftime('%d/%m/%y %H:%M')
-
-
-@view_config(name='workflow-publication.json', context=IBlogManager, request_type=IPyAMSLayer,
-             permission=MANAGE_SITE_PERMISSION, renderer='json', xhr=True)
-class BlogManagerWorkflowPublicationAJAXEditForm(AJAXEditForm, BlogManagerWorkflowPublicationEditForm):
-    """Blog manager workflow publication edit form, JSON renderer"""