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
=== modified file 'openerp/modules/loading.py'
--- openerp/modules/loading.py 2012-02-20 10:59:43 +0000
+++ openerp/modules/loading.py 2013-10-04 13:19:54 +0000
@@ -51,6 +51,7 @@
51import openerp.tools as tools51import openerp.tools as tools
52import openerp.tools.osutil as osutil52import openerp.tools.osutil as osutil
5353
54from openerp import SUPERUSER_ID
54from openerp.tools.safe_eval import safe_eval as eval55from openerp.tools.safe_eval import safe_eval as eval
55from openerp.tools.translate import _56from openerp.tools.translate import _
56from openerp.modules.module import \57from openerp.modules.module import \
@@ -415,6 +416,11 @@
415 cr.commit()416 cr.commit()
416417
417 _logger.info('Modules loaded.')418 _logger.info('Modules loaded.')
419
420 # STEP 7: call _register_hook on every model
421 for model in pool.models.values():
422 model._register_hook(cr, SUPERUSER_ID, [])
423
418 finally:424 finally:
419 cr.close()425 cr.close()
420426
421427
=== modified file 'openerp/osv/orm.py'
--- openerp/osv/orm.py 2013-06-20 14:02:50 +0000
+++ openerp/osv/orm.py 2013-10-04 13:19:54 +0000
@@ -4989,7 +4989,11 @@
4989 if command in (0, 1): item.update(record)4989 if command in (0, 1): item.update(record)
4990 record_dicts.append(item)4990 record_dicts.append(item)
4991 return record_dicts4991 return record_dicts
49924992
4993 def _register_hook(self, cr, uid, ids=None):
4994 """ stuff to do right after the registry is built """
4995 pass
4996
4993# keep this import here, at top it will cause dependency cycle errors4997# keep this import here, at top it will cause dependency cycle errors
4994import expression4998import expression
49954999