Merge lp:~fabien-morin/unifield-server/fm-uf3-0rc1_small_fixes into lp:unifield-server

[Fabien MORIN]

this should fix the problem of sync_server where we cannot login because of the new "synchronize" property on res_users.

[lp:~fabien-morin/unifield-server/fm-uf3-0rc1_small_fixes]

4086. By Fabien MORIN on 2016-11-24

[FIX] it's needed here too not to browse all fields of res.users to avoid crash
when a new property has been added to this model and the modules haven't been
upgraded yet.

Unmerged revisions

4086. By Fabien MORIN on 2016-11-24

[FIX] it's needed here too not to browse all fields of res.users to avoid crash
when a new property has been added to this model and the modules haven't been
upgraded yet.

4085. By Fabien MORIN on 2016-11-23

[FIX] add the possibility to pass fields_to_fetch to get_entity and res_users.
This is made possible to login on sync_server when some new properties have been added to this
models but the module upgrade have not been done.

=== modified file 'bin/addons/base/ir/ir_actions.py'
--- bin/addons/base/ir/ir_actions.py	2016-11-08 16:43:27 +0000
+++ bin/addons/base/ir/ir_actions.py	2016-11-24 16:58:14 +0000
@@ -249,7 +249,8 @@
         return res
 
     def _get_help_status(self, cr, uid, ids, name, arg, context=None):
-        activate_tips = self.pool.get('res.users').browse(cr, uid, uid).menu_tips
+        activate_tips = self.pool.get('res.users').browse(cr, uid, uid,
+                fields_to_fetch=['menu_tips']).menu_tips
         return dict([(id, activate_tips) for id in ids])
 
     def _get_groups_txt(self, cr, uid, ids, name, arg, context=None):
 
=== modified file 'bin/addons/base/res/res_user.py'
--- bin/addons/base/res/res_user.py	2016-11-21 09:55:11 +0000
+++ bin/addons/base/res/res_user.py	2016-11-24 16:58:14 +0000
@@ -515,11 +515,13 @@
         return super(users, self).copy(cr, uid, id, copydef, context)
 
     def context_get(self, cr, uid, context=None):
-        user = self.browse(cr, uid, uid, context)
         result = {}
-        for k in self._columns.keys():
-            if k.startswith('context_'):
-                res = getattr(user,k) or False
+        fields_to_fetch = [k for k in self._columns.keys() if k.startswith('context_')]
+        if fields_to_fetch:
+            user = self.browse(cr, uid, uid, context=context,
+                    fields_to_fetch=fields_to_fetch)
+            for k in fields_to_fetch:
+                res = getattr(user, k) or False
                 if isinstance(res, browse_record):
                     res = res.id
                 result[k[8:]] = res or False
 
=== modified file 'bin/addons/sync_client/operations.py'
--- bin/addons/sync_client/operations.py	2016-11-08 15:31:23 +0000
+++ bin/addons/sync_client/operations.py	2016-11-24 16:58:14 +0000
@@ -130,7 +130,8 @@
     _logger = logging.getLogger('operations.event')
 
     def _get_inst(self, cr, uid):
-        i = self.pool.get('sync.client.entity').get_entity(cr, uid).name;
+        i = self.pool.get('sync.client.entity').get_entity(cr, uid,
+                fields_to_fetch=['name']).name;
         if i is None:
             return "unknown"
         return i
@@ -198,7 +199,8 @@
         self.histogram['sql'] = Histogram( buckets=20, name='sql')
 
     def _get_inst(self, cr, uid):
-        i = self.pool.get('sync.client.entity').get_entity(cr, uid).name;
+        i = self.pool.get('sync.client.entity').get_entity(cr, uid,
+                fields_to_fetch=['name']).name;
         if i is None:
             return "unknown"
         return i
 
=== modified file 'bin/addons/sync_client/sync_client.py'
--- bin/addons/sync_client/sync_client.py	2016-11-18 13:31:06 +0000
+++ bin/addons/sync_client/sync_client.py	2016-11-24 16:58:14 +0000
@@ -466,15 +466,20 @@
         'message_last' : 0,
     }
 
-    def get_entity(self, cr, uid, context=None):
+    def get_entity(self, cr, uid, context=None, fields_to_fetch=None):
         ids = self.search(cr, uid, [], context=context)
-        return self.browse(cr, uid, ids, context=context)[0]
+        if fields_to_fetch is None:
+            fields_to_fetch = []
+        return self.browse(cr, uid, ids, context=context,
+                fields_to_fetch=fields_to_fetch)[0]
 
-    def _get_entity(self, cr):
+    def _get_entity(self, cr, fields_to_fetch=None):
         """
         private method to get entity with uid = 1
         """
         ids = self.search(cr, 1, [])
+        if fields_to_fetch:
+            return self.browse(cr, 1, ids, fields_to_fetch=fields_to_fetch)[0]
         return self.browse(cr, 1, ids)[0]
 
     def generate_uuid(self):