src/pyams_content/shared/site/zmi/manager.py
changeset 492 04503227569d
parent 336 d9f37252a42d
child 579 5e4875a9f692
--- a/src/pyams_content/shared/site/zmi/manager.py	Thu Mar 22 14:50:32 2018 +0100
+++ b/src/pyams_content/shared/site/zmi/manager.py	Thu Mar 22 14:52:22 2018 +0100
@@ -18,7 +18,7 @@
 # import interfaces
 from pyams_content.interfaces import MANAGE_SITE_ROOT_PERMISSION
 from pyams_content.root.interfaces import ISiteRoot
-from pyams_content.shared.site.interfaces import ISiteManager
+from pyams_content.shared.site.interfaces import ISiteManager, ISiteManagerFactory
 from pyams_content.skin.zmi.interfaces import ISiteTreeTable, IUserAddingsMenuLabel
 from pyams_i18n.interfaces import II18n, INegotiator
 from pyams_skin.interfaces.container import ITableElementEditor
@@ -29,6 +29,7 @@
 
 # import packages
 from pyams_content.shared.site import WfTopic
+from pyams_content.shared.site.manager import SiteManager
 from pyams_form.form import AJAXAddForm
 from pyams_pagelet.pagelet import pagelet_config
 from pyams_skin.table import DefaultElementEditorAdapter
@@ -66,9 +67,9 @@
 
     @property
     def label(self):
-        return '{content} ({blog})'.format(
+        return '{content} ({site})'.format(
             content=self.request.localizer.translate(WfTopic.content_name),
-            blog=II18n(self.context).query_attribute('title', request=self.request))
+            site=II18n(self.context).query_attribute('title', request=self.request))
 
 
 @viewlet_config(name='add-site-manager.menu', context=ISiteRoot, layer=IAdminLayer,
@@ -97,9 +98,10 @@
 
     def create(self, data):
         factory = self.request.registry.settings.get('pyams_content.config.site_factory')
-        if factory is None:
-            factory = 'pyams_content.shared.site.manager.SiteManager'
-        factory = DottedNameResolver().resolve(factory)
+        if factory:
+            factory = DottedNameResolver().resolve(factory)
+        else:
+            factory = ISiteManagerFactory(self.context, SiteManager)
         return factory()
 
     def add(self, object):