Merge lp:~therp-nl/openobject-server/7.0-lp1253200-dont_browse_in_res_users_context_get into lp:openobject-server/7.0

[Stefan Rijnhart (Opener)]

Green on runbot

[lp:~therp-nl/openobject-server/7.0-lp1253200-dont_browse_in_res_users_context_get]

5139. By Stefan Rijnhart (Opener) on 2014-08-13

[FIX] another occurrence of the problem, in fields_view_get_address

Unmerged revisions

5139. By Stefan Rijnhart (Opener) on 2014-08-13

[FIX] another occurrence of the problem, in fields_view_get_address

5138. By Stefan Rijnhart (Opener) on 2013-11-20

[FIX] Don't browse in res_users::context_get(), which is called very
 early in the upgrade process. This can lead to problems when
 an installed, but yet unloaded module has turned a user or
 partner column into an unstored function or related field.
 The browsing will attempt a read on the database column which
 will have been dropped by the ORM.

=== modified file 'openerp/addons/base/res/res_partner.py'
--- openerp/addons/base/res/res_partner.py	2014-04-04 14:16:11 +0000
+++ openerp/addons/base/res/res_partner.py	2014-08-13 09:05:46 +0000
@@ -34,7 +34,12 @@
 from openerp.tools.yaml_import import is_comment
 
 class format_address(object):
-    def fields_view_get_address(self, cr, uid, arch, context={}):
+    def fields_view_get_address(self, cr, uid, arch, context=None):
+        if context and context.get('check_view_ids'):
+            # browsing user or company breaks at module update time when an
+            # unrelated module replaces a partner column by an unstored
+            # function field.
+            return arch
         user_obj = self.pool.get('res.users')
         fmt = user_obj.browse(cr, SUPERUSER_ID, uid, context).company_id.country_id
         fmt = fmt and fmt.address_format

=== modified file 'openerp/addons/base/res/res_users.py'
--- openerp/addons/base/res/res_users.py	2014-04-29 07:11:25 +0000
+++ openerp/addons/base/res/res_users.py	2014-08-13 09:05:46 +0000
@@ -370,20 +370,20 @@
 
     @tools.ormcache(skiparg=2)
     def context_get(self, cr, uid, context=None):
-        user = self.browse(cr, SUPERUSER_ID, uid, context)
         result = {}
+        context_keys = []
         for k in self._all_columns.keys():
             if k.startswith('context_'):
-                context_key = k[8:]
+                context_keys.append(k[8:])
             elif k in ['lang', 'tz']:
-                context_key = k
-            else:
-                context_key = False
-            if context_key:
-                res = getattr(user,k) or False
-                if isinstance(res, browse_record):
-                    res = res.id
-                result[context_key] = res or False
+                context_keys.append(k)
+        user = self.read(cr, SUPERUSER_ID, [uid],
+                         context_keys, context=context)[0]
+        for context_key in context_keys:
+            res = user.get(context_key)
+            if isinstance(res, tuple):
+                res = res[0]
+            result[context_key] = res or False
         return result
 
     def action_get(self, cr, uid, context=None):