[IMP]: wiki: Minor fixes

bzr revid: rpa@tinyerp.com-20100412100618-daws1apbtl75fyju

diff --git a/addons/wiki/wiki.py b/addons/wiki/wiki.py
index 55b71b8..bdb92c6 100644 (file)
--- a/addons/wiki/wiki.py
+++ b/addons/wiki/wiki.py
@@ -52,7 +52,7 @@ class WikiGroup(osv.osv):
        'section': fields.boolean("Make Section ?"), 
        'method':fields.selection([('list', 'List'), ('page', 'Home Page'), \
                                    ('tree', 'Tree')], 'Display Method'), 
-       'home':fields.many2one('wiki.wiki', 'Pages'), 
+       'home':fields.many2one('wiki.wiki', 'Home Page'), 
     }
 
     _defaults = {

diff --git a/addons/wiki/wizard/wiki_wiki_help_open.py b/addons/wiki/wizard/wiki_wiki_help_open.py
index 1333f80..0bd119e 100644 (file)
--- a/addons/wiki/wizard/wiki_wiki_help_open.py
+++ b/addons/wiki/wizard/wiki_wiki_help_open.py
@@ -36,7 +36,8 @@ class wiki_wiki_help_open(osv.osv_memory):
 
         """
         pages = self.pool.get('wiki.wiki').search(cr, uid, [('name', '=', 'Basic Wiki Editing')])
-
+        if not pages:
+            return {}
         value = {
             'view_type': 'form', 
             'view_mode': 'form,tree', 

diff --git a/addons/wiki/wizard/wiki_wiki_page_open.py b/addons/wiki/wizard/wiki_wiki_page_open.py
index d65748f..003e86d 100644 (file)
--- a/addons/wiki/wizard/wiki_wiki_page_open.py
+++ b/addons/wiki/wizard/wiki_wiki_page_open.py
@@ -35,9 +35,8 @@ class wiki_wiki_page_open(osv.osv_memory):
         @param ids: List of open wiki page’s IDs
         @return: dictionay of open wiki window on give group id
         """
-
-        for group in self.pool.get('wiki.groups').browse(cr, uid, ids):
-
+        group_ids = context.get('active_ids', [])
+        for group in self.pool.get('wiki.groups').browse(cr, uid, group_ids):
             value = {
                 'domain': "[('group_id','=',%d)]" % (group.id), 
                 'name': 'Wiki Page', 
@@ -46,7 +45,7 @@ class wiki_wiki_page_open(osv.osv_memory):
                 'res_model': 'wiki.wiki', 
                 'view_id': False, 
                 'type': 'ir.actions.act_window', 
-        }
+                }
         if group.method == 'page':
             value['res_id'] = group.home.id
         elif group.method == 'list':