diff options
| author | uco (OpenERP) <uco@tinyerp.com> | 2010-12-30 11:37:53 +0530 |
|---|---|---|
| committer | uco (OpenERP) <uco@tinyerp.com> | 2010-12-30 11:37:53 +0530 |
| commit | e0416f8a8fb82174fdaafdbf4bb6dfced55a2b04 (patch) | |
| tree | 5d46c1dd0eb72bf230a4bcbf9d7980ada4c8fd51 /addons/wiki/wizard | |
| parent | c3098f4f437708c7b2d6d4a52cd02950c5b67f31 (diff) | |
| parent | b352cf0e20d1e17f4cdbd93c3c388fc0004ea50a (diff) | |
[MERGE]
bzr revid: uco@tinyerp.com-20101230060753-wujam7otb5f13f0z
Diffstat (limited to 'addons/wiki/wizard')
| -rw-r--r-- | addons/wiki/wizard/wiki_create_menu.py | 4 | ||||
| -rw-r--r-- | addons/wiki/wizard/wiki_make_index.py | 2 | ||||
| -rw-r--r-- | addons/wiki/wizard/wiki_wiki_page_open.py | 4 |
3 files changed, 5 insertions, 5 deletions
diff --git a/addons/wiki/wizard/wiki_create_menu.py b/addons/wiki/wizard/wiki_create_menu.py index f95c1e2dffd..654a9ff3898 100644 --- a/addons/wiki/wizard/wiki_create_menu.py +++ b/addons/wiki/wizard/wiki_create_menu.py @@ -72,7 +72,7 @@ class wiki_create_menu(osv.osv_memory): value['view_type'] = 'form' value['view_mode'] = 'tree,form' elif group.method == 'tree': - view_id = obj_view.search(cr, uid, [('name', '=', 'wiki.wiki.tree.childs')]) + view_id = obj_view.search(cr, uid, [('name', '=', 'wiki.wiki.tree.children')]) value['view_id'] = view_id value['domain'] = [('group_id', '=', group.id), ('parent_id', '=', False)] value['view_type'] = 'tree' @@ -86,7 +86,7 @@ class wiki_create_menu(osv.osv_memory): 'action': 'ir.actions.act_window,'+ str(action_id), }, context) obj_wiki_group.write(cr, uid, [group_id], {'menu_id':menu_id}) - return {} + return {'type': 'ir.actions.act_window_close'} wiki_create_menu() diff --git a/addons/wiki/wizard/wiki_make_index.py b/addons/wiki/wizard/wiki_make_index.py index 6b159b7ac30..1e2dae8f92d 100644 --- a/addons/wiki/wizard/wiki_make_index.py +++ b/addons/wiki/wizard/wiki_make_index.py @@ -87,7 +87,7 @@ class wiki_make_index(osv.osv_memory): for rs in result: wiki_pool.write(cr, uid, [rs[1]], {'section':rs[0]}) - return {} + return {'type': 'ir.actions.act_window_close'} wiki_make_index() diff --git a/addons/wiki/wizard/wiki_wiki_page_open.py b/addons/wiki/wizard/wiki_wiki_page_open.py index 1fe4f8acc49..215a49f29fe 100644 --- a/addons/wiki/wizard/wiki_wiki_page_open.py +++ b/addons/wiki/wizard/wiki_wiki_page_open.py @@ -19,7 +19,7 @@ # ############################################################################## -from osv import fields, osv +from osv import osv class wiki_wiki_page_open(osv.osv_memory): """ wizard Open Page """ @@ -54,7 +54,7 @@ class wiki_wiki_page_open(osv.osv_memory): value['view_type'] = 'form' value['view_mode'] = 'tree,form' elif group.method == 'tree': - view_id = self.pool.get('ir.ui.view').search(cr, uid, [('name', '=', 'wiki.wiki.tree.childs')]) + view_id = self.pool.get('ir.ui.view').search(cr, uid, [('name', '=', 'wiki.wiki.tree.children')]) value['view_id'] = view_id value['domain'] = [('group_id', '=', group.id), ('parent_id', '=', False)] value['view_type'] = 'tree' |