Odoo Server (MOVED TO GITHUB)

Merge lp:~therp-nl/openobject-server/trunk-lp1259165 into lp:openobject-server

  1. trunk-lp1259165
  2. Merge into trunk
Proposed by Holger Brunn (Therp)
Status: Needs review
Proposed branch: lp:~therp-nl/openobject-server/trunk-lp1259165
Merge into: lp:openobject-server
Diff against target: 17 lines (+2/-1)
1 file modified
openerp/addons/base/ir/ir_attachment.py (+2/-1)
To merge this branch: bzr merge lp:~therp-nl/openobject-server/trunk-lp1259165
Reviewer Review Type Date Requested Status
Alexandre Fayolle - camptocamp (community) code review, no test Approve
OpenERP Core Team Pending
Review via email: mp+198263@code.launchpad.net
To post a comment you must log in.
Revision history for this message
Alexandre Fayolle - camptocamp (alexandre-fayolle-c2c) wrote :

LGTM

review: Approve (code review, no test)
Reply

Unmerged revisions

5010. By Holger Brunn (Therp)

[FIX] return _auto_init's result

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'openerp/addons/base/ir/ir_attachment.py'
2--- openerp/addons/base/ir/ir_attachment.py 2013-11-20 10:25:45 +0000
3+++ openerp/addons/base/ir/ir_attachment.py 2013-12-09 13:50:34 +0000
4@@ -177,11 +177,12 @@
5 }
6
7 def _auto_init(self, cr, context=None):
8- super(ir_attachment, self)._auto_init(cr, context)
9+ result = super(ir_attachment, self)._auto_init(cr, context)
10 cr.execute('SELECT indexname FROM pg_indexes WHERE indexname = %s', ('ir_attachment_res_idx',))
11 if not cr.fetchone():
12 cr.execute('CREATE INDEX ir_attachment_res_idx ON ir_attachment (res_model, res_id)')
13 cr.commit()
14+ return result
15
16 def check(self, cr, uid, ids, mode, context=None, values=None):
17 """Restricts the access to an ir.attachment, according to referred model