Merge lp:~yann-papouin/openobject-server/6.1-bug-944197-register-hook-server-start into lp:openobject-server/6.1

Proposed by Yann Papouin
Status: Needs review
Proposed branch: lp:~yann-papouin/openobject-server/6.1-bug-944197-register-hook-server-start
Merge into: lp:openobject-server/6.1
Diff against target: 39 lines (+11/-1)
2 files modified
openerp/modules/loading.py (+6/-0)
openerp/osv/orm.py (+5/-1)
To merge this branch: bzr merge lp:~yann-papouin/openobject-server/6.1-bug-944197-register-hook-server-start
Reviewer Review Type Date Requested Status
OpenERP Core Team Pending
Review via email: mp+189087@code.launchpad.net

Description of the change

Backport from trunk

To post a comment you must log in.
4366. By Yann Papouin

Changing "_register_hook" signature to allow passing uid and ids directly in server part.
This will allow to update the server without breaking the addons part.

Unmerged revisions

4366. By Yann Papouin

Changing "_register_hook" signature to allow passing uid and ids directly in server part.
This will allow to update the server without breaking the addons part.

4365. By Yann Papouin

[FIX] Action Rules don't work right after server is started (note: addons repo must be patched too)

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 2012-02-20 10:59:43 +0000
3+++ openerp/modules/loading.py 2013-10-04 13:19:54 +0000
4@@ -51,6 +51,7 @@
5 import openerp.tools as tools
6 import openerp.tools.osutil as osutil
7
8+from openerp import SUPERUSER_ID
9 from openerp.tools.safe_eval import safe_eval as eval
10 from openerp.tools.translate import _
11 from openerp.modules.module import \
12@@ -415,6 +416,11 @@
13 cr.commit()
14
15 _logger.info('Modules loaded.')
16+
17+ # STEP 7: call _register_hook on every model
18+ for model in pool.models.values():
19+ model._register_hook(cr, SUPERUSER_ID, [])
20+
21 finally:
22 cr.close()
23
24
25=== modified file 'openerp/osv/orm.py'
26--- openerp/osv/orm.py 2013-06-20 14:02:50 +0000
27+++ openerp/osv/orm.py 2013-10-04 13:19:54 +0000
28@@ -4989,7 +4989,11 @@
29 if command in (0, 1): item.update(record)
30 record_dicts.append(item)
31 return record_dicts
32-
33+
34+ def _register_hook(self, cr, uid, ids=None):
35+ """ stuff to do right after the registry is built """
36+ pass
37+
38 # keep this import here, at top it will cause dependency cycle errors
39 import expression
40