Commit 2bf6e593 authored by Jérome Perrin's avatar Jérome Perrin

pass create_activities to setup()



git-svn-id: https://svn.erp5.org/repos/public/erp5/trunk@8159 20353a03-c40f-0410-a6d1-a30d3c3de9de
parent 025251c6
...@@ -869,7 +869,7 @@ class ERP5Generator(PortalGenerator): ...@@ -869,7 +869,7 @@ class ERP5Generator(PortalGenerator):
p._setProperty('cmf_activity_sql_connection_type', cmf_activity_sql_connection_type, 'string') p._setProperty('cmf_activity_sql_connection_type', cmf_activity_sql_connection_type, 'string')
p._setProperty('cmf_activity_sql_connection_string', cmf_activity_sql_connection_string, 'string') p._setProperty('cmf_activity_sql_connection_string', cmf_activity_sql_connection_string, 'string')
p._setProperty('management_page_charset', 'UTF-8', 'string') p._setProperty('management_page_charset', 'UTF-8', 'string')
self.setup(p, create_userfolder, **kw) self.setup(p, create_userfolder, create_activities=create_activities, **kw)
return p return p
...@@ -880,7 +880,7 @@ class ERP5Generator(PortalGenerator): ...@@ -880,7 +880,7 @@ class ERP5Generator(PortalGenerator):
make sure that we do not put un the queue the full reindexation make sure that we do not put un the queue the full reindexation
""" """
# Add Activity Tool # Add Activity Tool
if kw.has_key('create_activities') and int(kw['create_activities'])==1: if kw.get('create_activities', 0):
if not p.hasObject('portal_activities'): if not p.hasObject('portal_activities'):
addTool = p.manage_addProduct['CMFActivity'].manage_addTool addTool = p.manage_addProduct['CMFActivity'].manage_addTool
addTool('CMF Activity Tool', None) # Allow user to select active/passive addTool('CMF Activity Tool', None) # Allow user to select active/passive
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment