Commit 28ccff68 authored by Aurel's avatar Aurel

fis install of result table and result key


git-svn-id: https://svn.erp5.org/repos/public/erp5/trunk@4885 20353a03-c40f-0410-a6d1-a30d3c3de9de
parent cc3072e3
...@@ -1950,12 +1950,13 @@ class CatalogResultKeyTemplateItem(BaseTemplateItem): ...@@ -1950,12 +1950,13 @@ class CatalogResultKeyTemplateItem(BaseTemplateItem):
keys = self._archive.keys() keys = self._archive.keys()
update_dict = kw.get('object_to_update') update_dict = kw.get('object_to_update')
force = kw.get('force') force = kw.get('force')
for key in keys: # XXX same as related key
if update_dict.has_key(key) or force: if update_dict.has_key(key) or force:
if not force: if not force:
action = update_dict[key] action = update_dict[key]
if action == 'nothing': if action == 'nothing':
continue continue
for key in keys:
if key not in sql_search_result_keys: if key not in sql_search_result_keys:
sql_search_result_keys.append(key) sql_search_result_keys.append(key)
catalog.sql_search_result_keys = sql_search_result_keys catalog.sql_search_result_keys = sql_search_result_keys
...@@ -2147,12 +2148,13 @@ class CatalogResultTableTemplateItem(BaseTemplateItem): ...@@ -2147,12 +2148,13 @@ class CatalogResultTableTemplateItem(BaseTemplateItem):
keys = self._archive.keys() keys = self._archive.keys()
update_dict = kw.get('object_to_update') update_dict = kw.get('object_to_update')
force = kw.get('force') force = kw.get('force')
for key in keys: # XXX same as related keys
if update_dict.has_key(key) or force: if update_dict.has_key(key) or force:
if not force: if not force:
action = update_dict[key] action = update_dict[key]
if action == 'nothing': if action == 'nothing':
continue continue
for key in keys:
if key not in sql_search_tables: if key not in sql_search_tables:
sql_search_tables.append(key) sql_search_tables.append(key)
catalog.sql_search_tables = sql_search_tables catalog.sql_search_tables = sql_search_tables
......
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