Commit c9f102d7 authored by Julien Muchembled's avatar Julien Muchembled

TemplateTool.updateBusinessTemplateFromUrl: do not clear catalog unless explicitely requested

parent 51328ef1
...@@ -5158,7 +5158,7 @@ Business Template is a set of definitions, such as skins, portal types and categ ...@@ -5158,7 +5158,7 @@ Business Template is a set of definitions, such as skins, portal types and categ
return modified_object_list return modified_object_list
def _install(self, force=1, object_to_update=None, update_translation=0, def _install(self, force=1, object_to_update=None, update_translation=0,
update_catalog=_MARKER, **kw): update_catalog=False, **kw):
""" """
Install a new Business Template, if force, all will be upgraded or installed Install a new Business Template, if force, all will be upgraded or installed
otherwise depends of dict object_to_update otherwise depends of dict object_to_update
......
...@@ -1341,7 +1341,7 @@ class TemplateTool (BaseTool): ...@@ -1341,7 +1341,7 @@ class TemplateTool (BaseTool):
keep_original_list=None, keep_original_list=None,
before_triggered_bt5_id_list=None, before_triggered_bt5_id_list=None,
after_triggered_bt5_id_list=None, after_triggered_bt5_id_list=None,
update_catalog=_MARKER, update_catalog=False,
reinstall=False, reinstall=False,
active_process=None, active_process=None,
force_keep_list=None, force_keep_list=None,
...@@ -1428,9 +1428,6 @@ class TemplateTool (BaseTool): ...@@ -1428,9 +1428,6 @@ class TemplateTool (BaseTool):
log('Execute %r' % before_triggered_bt5_id) log('Execute %r' % before_triggered_bt5_id)
imported_bt5.unrestrictedTraverse(before_triggered_bt5_id)() imported_bt5.unrestrictedTraverse(before_triggered_bt5_id)()
if update_catalog is _MARKER and install_kw != {}:
update_catalog = imported_bt5.isCatalogUpdatable()
imported_bt5.install(object_to_update=install_kw, imported_bt5.install(object_to_update=install_kw,
update_catalog=update_catalog) update_catalog=update_catalog)
......
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