Merge lp:~syleam/openobject-server/5.0-fix-565311 into lp:openobject-server/5.0

Proposed by Christophe CHAUVET
Status: Rejected
Rejected by: Olivier Dony (Odoo)
Proposed branch: lp:~syleam/openobject-server/5.0-fix-565311
Merge into: lp:openobject-server/5.0
Diff against target: 15 lines (+4/-1)
1 file modified
bin/addons/base/res/res_user.py (+4/-1)
To merge this branch: bzr merge lp:~syleam/openobject-server/5.0-fix-565311
Reviewer Review Type Date Requested Status
Jay Vora (Serpent Consulting Services) (community) Disapprove
Christophe Simonis (OpenERP) Needs Fixing
Review via email: mp+23607@code.launchpad.net

Description of the change

To post a comment you must log in.
Revision history for this message
Christophe Simonis (OpenERP) (kangol) wrote :

Can you add a test ?

review: Needs Fixing
Revision history for this message
Jay Vora (Serpent Consulting Services) (jayvora) wrote :

I guess, there is no bug here!

review: Disapprove

Unmerged revisions

2035. By Christophe CHAUVET

[FIX] Fix when normal user can only send request to himself

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'bin/addons/base/res/res_user.py'
2--- bin/addons/base/res/res_user.py 2010-03-11 13:27:26 +0000
3+++ bin/addons/base/res/res_user.py 2010-04-17 11:07:16 +0000
4@@ -216,7 +216,10 @@
5 if name:
6 ids = self.search(cr, user, [('login','=',name)]+ args, limit=limit)
7 if not ids:
8- ids = self.search(cr, user, [('name',operator,name)]+ args, limit=limit)
9+ if name:
10+ ids = self.search(cr, user, [('name',operator,name)]+ args, limit=limit)
11+ else:
12+ ids = self.search(cr, user, args, limit=limit)
13 return self.name_get(cr, user, ids)
14
15 def copy(self, cr, uid, id, default=None, context={}):