Commit 438783b5 authored by Alexandre Boeglin's avatar Alexandre Boeglin

Fixed bug (can only concatenate tuple (not "list") to tuple).


git-svn-id: https://svn.erp5.org/repos/public/erp5/trunk@2798 20353a03-c40f-0410-a6d1-a30d3c3de9de
parent 1dba94ee
...@@ -789,9 +789,11 @@ class CatalogResultKeyTemplateItem(BaseTemplateItem): ...@@ -789,9 +789,11 @@ class CatalogResultKeyTemplateItem(BaseTemplateItem):
LOG('BusinessTemplate', 0, 'no SQL catalog was available') LOG('BusinessTemplate', 0, 'no SQL catalog was available')
return return
sql_search_result_keys = list(catalog.sql_search_result_keys)
for key in self._archive.keys(): for key in self._archive.keys():
if key not in catalog.sql_search_result_keys: if key not in sql_search_result_keys:
catalog.sql_search_result_keys = (key,) + catalog.sql_search_result_keys sql_search_result_keys.append(key)
catalog.sql_search_result_keys = sql_search_result_keys
def uninstall(self, context, **kw): def uninstall(self, context, **kw):
try: try:
...@@ -825,9 +827,11 @@ class CatalogRelatedKeyTemplateItem(BaseTemplateItem): ...@@ -825,9 +827,11 @@ class CatalogRelatedKeyTemplateItem(BaseTemplateItem):
LOG('BusinessTemplate', 0, 'no SQL catalog was available') LOG('BusinessTemplate', 0, 'no SQL catalog was available')
return return
sql_catalog_related_keys = list(catalog.sql_catalog_related_keys)
for key in self._archive.keys(): for key in self._archive.keys():
if key not in catalog.sql_catalog_related_keys: if key not in sql_catalog_related_keys:
catalog.sql_catalog_related_keys = (key,) + catalog.sql_catalog_related_keys sql_catalog_related_keys.append(key)
catalog.sql_catalog_related_keys = sql_catalog_related_keys
def uninstall(self, context, **kw): def uninstall(self, context, **kw):
try: try:
...@@ -861,9 +865,11 @@ class CatalogResultTableTemplateItem(BaseTemplateItem): ...@@ -861,9 +865,11 @@ class CatalogResultTableTemplateItem(BaseTemplateItem):
LOG('BusinessTemplate', 0, 'no SQL catalog was available') LOG('BusinessTemplate', 0, 'no SQL catalog was available')
return return
for table in self._archive.keys(): sql_search_tables = list(catalog.sql_search_tables)
if table not in catalog.sql_search_tables: for key in self._archive.keys():
catalog.sql_search_tables = (table,) + catalog.sql_search_tables if key not in sql_search_tables:
sql_search_tables.append(key)
catalog.sql_search_tables = sql_search_tables
def uninstall(self, context, **kw): def uninstall(self, context, **kw):
try: try:
......
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