Merge lp:~openerp-dev/openobject-server/trunk-imp-register_hook_improved-cto into lp:openobject-server

Proposed by Samus CTO (OpenERP)
Status: Needs review
Proposed branch: lp:~openerp-dev/openobject-server/trunk-imp-register_hook_improved-cto
Merge into: lp:openobject-server
Diff against target: 26 lines (+4/-2)
2 files modified
openerp/modules/loading.py (+3/-1)
openerp/osv/orm.py (+1/-1)
To merge this branch: bzr merge lp:~openerp-dev/openobject-server/trunk-imp-register_hook_improved-cto
Reviewer Review Type Date Requested Status
Christophe Simonis (OpenERP) Pending
Review via email: mp+206923@code.launchpad.net

Description of the change

Hello,

Here is a fix for the missing commit after calling _register_hook and also I added the update_module parameter which is very useful to know after having loaded a pool and can't be guessed with the tools.config because this variable is reset before the call of _register_hook.

This branch is related: https://code.launchpad.net/~openerp-dev/openobject-addons/trunk-imp-register_hook_improved-cto

Thanks

To post a comment you must log in.

Unmerged revisions

5081. By Samus CTO (OpenERP)

[IMP] after all _register_hook calls, the cursor is committed + added the update_module flag in argument of the call because it can be useful

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'openerp/modules/loading.py'
2--- openerp/modules/loading.py 2014-02-09 00:40:05 +0000
3+++ openerp/modules/loading.py 2014-02-18 12:50:46 +0000
4@@ -419,7 +419,9 @@
5
6 # STEP 8: call _register_hook on every model
7 for model in registry.models.values():
8- model._register_hook(cr)
9+ model._register_hook(cr, update_module)
10+ # final commit to apply everything did in the _register_hook calls
11+ cr.commit()
12
13 finally:
14 cr.close()
15
16=== modified file 'openerp/osv/orm.py'
17--- openerp/osv/orm.py 2014-02-14 14:52:19 +0000
18+++ openerp/osv/orm.py 2014-02-18 12:50:46 +0000
19@@ -5033,7 +5033,7 @@
20 index = dict((r['id'], r) for r in result)
21 return [index[x] for x in record_ids if x in index]
22
23- def _register_hook(self, cr):
24+ def _register_hook(self, cr, update_module):
25 """ stuff to do right after the registry is built """
26 pass
27