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
=== modified file 'openerp/modules/loading.py'
--- openerp/modules/loading.py 2014-02-09 00:40:05 +0000
+++ openerp/modules/loading.py 2014-02-18 12:50:46 +0000
@@ -419,7 +419,9 @@
419419
420 # STEP 8: call _register_hook on every model420 # STEP 8: call _register_hook on every model
421 for model in registry.models.values():421 for model in registry.models.values():
422 model._register_hook(cr)422 model._register_hook(cr, update_module)
423 # final commit to apply everything did in the _register_hook calls
424 cr.commit()
423425
424 finally:426 finally:
425 cr.close()427 cr.close()
426428
=== modified file 'openerp/osv/orm.py'
--- openerp/osv/orm.py 2014-02-14 14:52:19 +0000
+++ openerp/osv/orm.py 2014-02-18 12:50:46 +0000
@@ -5033,7 +5033,7 @@
5033 index = dict((r['id'], r) for r in result)5033 index = dict((r['id'], r) for r in result)
5034 return [index[x] for x in record_ids if x in index]5034 return [index[x] for x in record_ids if x in index]
50355035
5036 def _register_hook(self, cr):5036 def _register_hook(self, cr, update_module):
5037 """ stuff to do right after the registry is built """5037 """ stuff to do right after the registry is built """
5038 pass5038 pass
50395039