Merge lp:~openerp-dev/openobject-server/trunk-bug-780418-rga into lp:openobject-server

[Ravi Gadhia (OpenERP)]

[lp:~openerp-dev/openobject-server/trunk-bug-780418-rga]

3412. By Vo Minh Thu on 2011-05-13

[MERGE] yml test: more explicit message when some data is missing.

3413. By Vo Minh Thu on 2011-05-13

[MERGE] slightly improved log message for cron jobs.

3414. By Launchpad Translations on behalf of openerp on 2011-05-14

Launchpad automatic translations update.

3415. By Vo Minh Thu on 2011-05-16

[MERGE] merged fix for res_lang.

3416. By Vo Minh Thu on 2011-05-16

[REF] consistent, grepable ir.values object naming.

3417. By Vo Minh Thu on 2011-05-17

[FIX] res_lang: when testing if there is some default value on res.partner, pass it as a list of strings, not as a string.

3418. By Vo Minh Thu on 2011-05-17

[Fix] Set default value for current login user

3419. By Vo Minh Thu on 2011-05-17

[IMP] ir_value: forgot to add some comment.

[Vo Minh Thu (thu)]

Hello Ravi,

As you can see, I've added a little comment to your code and a small test case.
- Can you confirm that it tests what you intended to fix.
- Would you please add such test cases in your next merge proposals? We really want to better test the framework.

(Actually these tests are just the very minimum as they don't test much but the specific reported bug, but it is better than nothing.)

[Ravi Gadhia (OpenERP) (rga-openerp)]

Hello Vo Minh Thu,
      Thank you for add yml test and merge.
      ok, sure from next merge proposals, I will create yml test for such a specific test case.

=== modified file 'openerp/addons/base/__openerp__.py'
--- openerp/addons/base/__openerp__.py	2011-03-02 08:35:38 +0000
+++ openerp/addons/base/__openerp__.py	2011-05-17 14:17:50 +0000
@@ -94,6 +94,7 @@
         'test/bug_lp541545.xml',
         'test/test_osv_expression.yml',
         'test/test_ir_rule.yml', # <-- These tests modify/add/delete ir_rules.
+        'test/test_ir_values.yml',
     ],
     'installable': True,
     'active': True,

=== modified file 'openerp/addons/base/ir/ir_values.py'
--- openerp/addons/base/ir/ir_values.py	2010-12-06 13:19:28 +0000
+++ openerp/addons/base/ir/ir_values.py	2011-05-17 14:17:50 +0000
@@ -172,8 +172,15 @@
                 else:
                     where.append('res_id=%s')
                     params.append(res_id)
-
-            where.append('(user_id=%s or (user_id IS NULL)) order by id')
+            order = 'id'
+            if key == 'default':
+                # Make sure we get first the values for specific users, then
+                # the global values. The map/filter below will retain the first
+                # value for any given name. The 'order by' will put the null
+                # values last; this may be postgres specific (it is the
+                # behavior in postgres at least since 8.2).
+                order = 'user_id'
+            where.append('(user_id=%s or (user_id IS NULL)) order by '+ order)
             params.append(uid)
             clause = ' and '.join(where)
             cr.execute('select id,name,value,object,meta, key from ir_values where ' + clause, params)

=== added file 'openerp/addons/base/test/test_ir_values.yml'
--- openerp/addons/base/test/test_ir_values.yml	1970-01-01 00:00:00 +0000
+++ openerp/addons/base/test/test_ir_values.yml	2011-05-17 14:17:50 +0000
@@ -0,0 +1,24 @@
+    Create some default value for some (non-existing) model, for all users.
+-
+    !python {model: ir.values }: |
+        self.set(cr, uid, 'default', False, 'my_test_ir_value',['unexisting_model'], 'global value')
+-
+    Retrieve it.
+-
+    !python {model: ir.values }: |
+        # d is a list of triple (id, name, value)
+        d = self.get(cr, uid, 'default', False, ['unexisting_model'])
+        assert d[1] == 'my_test_ir_value'
+        assert d[2] == 'global_value'
+-
+    Do it again but for a specific user.
+-
+    !python {model: ir.values }: |
+        self.set(cr, uid, 'default', False, 'my_test_ir_value',['unexisting_model'], 'specific value', preserve_user=True)
+-
+    Retrieve it and check it is the one for the current user.
+-
+    !python {model: ir.values }: |
+        d = self.get(cr, uid, 'default', False, ['unexisting_model'])
+        assert d[1] == 'my_test_ir_value'
+        assert d[2] == 'specific_value'