merge improvement from the wiki-addons development branch

bzr revid: mga@tinyerp.com-20081205140731-nfx5yjrf7mbjajnp

addons/wiki/wiki.py

@@ -31,6 +31,16 @@ import time
 from StringIO import StringIO
 from HTMLParser import HTMLParser
 
+class GroupLink(osv.osv):
+    _name = "wiki.groups.link"
+    _description="Wiki Groups Links"
+    _rec_name = 'action_id'
+    _columns={
+       'group_id':fields.many2one('wiki.groups', 'Parent Group', ondelete='set null'),
+       'action_id': fields.many2one('ir.ui.menu', 'Menu')
+    }
+GroupLink()
+
 class WikiGroup(osv.osv):
     _name = "wiki.groups"
     _description="Wiki Groups"
@@ -44,8 +54,7 @@ class WikiGroup(osv.osv):
        'create_date':fields.datetime("Created Date", select=True),
        'template': fields.text('Wiki Template'),
        'section': fields.boolean("Make Section ?"),
-       'home':fields.many2one('wiki.wiki', 'Pages'),
-       'action_id': fields.many2one('ir.ui.menu', 'Menu')
+       'home':fields.many2one('wiki.wiki', 'Pages')
     }
 WikiGroup()
 

addons/wiki/wizard/create_menu.py

@@ -52,11 +52,12 @@ def wiki_menu_create(self, cr, uid, data, context):
     }, context)
     
     home = data['form']['page']
+    group_id = data['id']
     res = {
         'home':home,
-        'action_id':menu_id
     }
     pool.get('wiki.groups').write(cr, uid, [data['id']], res)
+    pool.get('wiki.groups.link').create(cr, uid, {'group_id':group_id, 'action_id':menu_id})
     
     return {}
 

addons/wiki/wizard/open_page.py

@@ -33,13 +33,12 @@ class wiz_timesheet_open(wizard.interface):
     def _open_wiki_page(self, cr, uid, data, context):
         pool = pooler.get_pool(cr.dbname)
         menu_id = data['id']
-        group_ids = pool.get('wiki.groups').search(cr, uid, [('action_id','=',menu_id)])
-
-        group = pool.get('wiki.groups').browse(cr, uid, group_ids[0])
+        group_ids = pool.get('wiki.groups.link').search(cr, uid, [('action_id','=',menu_id)])
+        group = pool.get('wiki.groups.link').browse(cr, uid, group_ids[0])
         
         value = {
-            'context': "{'group_id':%d}" % (group.id),
-            'domain': "[('group_id','child_of',[%s])]" % (group.id),
+            'context': "{'group_id':%d}" % (group.group_id.id),
+            'domain': "[('group_id','child_of',[%s])]" % (group.group_id.id),
             'name': 'Wiki Page',
             'view_type': 'form',
             'view_mode': 'form,tree',
@@ -47,8 +46,8 @@ class wiz_timesheet_open(wizard.interface):
             'view_id': False,
             'type': 'ir.actions.act_window',
         }
-        if group.home :
-            value['res_id'] = group.home.id
+        if group.group_id.home:
+            value['res_id'] = group.group_id.home.id
         else:
             value['view_type'] = 'form'
             value['view_mode'] = 'tree,form'