OpenERP Community Backports (Server)

Merge lp:~therp-nl/ocb-server/6.1-lp1259165 into lp:ocb-server/6.1

  1. 6.1-lp1259165
  2. Merge into 6.1
Proposed by Holger Brunn (Therp)
Status: Merged
Merged at revision: 4322
Proposed branch: lp:~therp-nl/ocb-server/6.1-lp1259165
Merge into: lp:ocb-server/6.1
Diff against target: 16 lines (+2/-1)
1 file modified
openerp/addons/base/ir/ir_attachment.py (+2/-1)
To merge this branch: bzr merge lp:~therp-nl/ocb-server/6.1-lp1259165
Reviewer Review Type Date Requested Status
Pedro Manuel Baeza code review Approve
Stefan Rijnhart (Opener) Approve
Review via email: mp+198261@code.launchpad.net
To post a comment you must log in.
Revision history for this message
Stefan Rijnhart (Opener) (stefan-opener) wrote :

Same as https://code.launchpad.net/~therp-nl/ocb-server/7.0-lp1259165

review: Approve
Revision history for this message
Pedro Manuel Baeza (pedro.baeza) wrote :

Thanks!

review: Approve (code review)

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 2012-08-21 14:16:05 +0000
3+++ openerp/addons/base/ir/ir_attachment.py 2013-12-09 13:49:27 +0000
4@@ -175,11 +175,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 ir_attachment()
17

Subscribers

People subscribed via source and target branches

to status/vote changes: