Merge lp:~therp-nl/openobject-addons/6.1-lp1154493-wiki_set_group_id into lp:openobject-addons/6.1

Proposed by Stefan Rijnhart (Opener)
Status: Needs review
Proposed branch: lp:~therp-nl/openobject-addons/6.1-lp1154493-wiki_set_group_id
Merge into: lp:openobject-addons/6.1
Diff against target: 35 lines (+3/-0)
3 files modified
wiki/wiki.py (+1/-0)
wiki/wizard/wiki_create_menu.py (+1/-0)
wiki/wizard/wiki_wiki_page_open.py (+1/-0)
To merge this branch: bzr merge lp:~therp-nl/openobject-addons/6.1-lp1154493-wiki_set_group_id
Reviewer Review Type Date Requested Status
OpenERP Core Team Pending
Review via email: mp+153086@code.launchpad.net
To post a comment you must log in.

Unmerged revisions

7184. By Stefan Rijnhart (Opener)

[FIX] Set group id for new wiki items

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'wiki/wiki.py'
--- wiki/wiki.py 2012-03-28 06:02:25 +0000
+++ wiki/wiki.py 2013-03-13 09:23:22 +0000
@@ -81,6 +81,7 @@
81 }81 }
82 group = self.browse(cr, uid, group_id, context=context)82 group = self.browse(cr, uid, group_id, context=context)
83 value['domain'] = "[('group_id','=',%d)]" % (group.id)83 value['domain'] = "[('group_id','=',%d)]" % (group.id)
84 value['context'] = "{'default_group_id': %d}" % (group.id)
84 if group.method == 'page':85 if group.method == 'page':
85 value['res_id'] = group.home.id86 value['res_id'] = group.home.id
86 elif group.method == 'list':87 elif group.method == 'list':
8788
=== modified file 'wiki/wizard/wiki_create_menu.py'
--- wiki/wizard/wiki_create_menu.py 2011-01-14 00:11:01 +0000
+++ wiki/wizard/wiki_create_menu.py 2013-03-13 09:23:22 +0000
@@ -66,6 +66,7 @@
66 }66 }
67 group = obj_wiki_group.browse(cr, uid, group_id, context=context)67 group = obj_wiki_group.browse(cr, uid, group_id, context=context)
68 value['domain'] = "[('group_id','=',%d)]" % (group.id)68 value['domain'] = "[('group_id','=',%d)]" % (group.id)
69 value['context'] = "{'default_group_id': %d}" % (group.id)
69 if group.method == 'page':70 if group.method == 'page':
70 value['res_id'] = group.home.id71 value['res_id'] = group.home.id
71 elif group.method == 'list':72 elif group.method == 'list':
7273
=== modified file 'wiki/wizard/wiki_wiki_page_open.py'
--- wiki/wizard/wiki_wiki_page_open.py 2011-01-14 00:11:01 +0000
+++ wiki/wizard/wiki_wiki_page_open.py 2013-03-13 09:23:22 +0000
@@ -41,6 +41,7 @@
41 for group in self.pool.get('wiki.groups').browse(cr, uid, group_ids, context=context):41 for group in self.pool.get('wiki.groups').browse(cr, uid, group_ids, context=context):
42 value = {42 value = {
43 'domain': "[('group_id','=',%d)]" % (group.id),43 'domain': "[('group_id','=',%d)]" % (group.id),
44 'context': "{'default_group_id': %d}" % (group.id),
44 'name': 'Wiki Page',45 'name': 'Wiki Page',
45 'view_type': 'form',46 'view_type': 'form',
46 'view_mode': 'form,tree',47 'view_mode': 'form,tree',