odoo
/
odoo
2
0
Fork 0
Code Pull Requests Releases Activity

[IMP] hr,crm,project: better _group_by_full imp: heed sorting 

bzr revid: odo@openerp.com-20111121164940-5d6d6jccex0eeaq6
This commit is contained in:
Olivier Dony 2011-11-21 17:49:40 +01:00
parent 63f1fef235
commit 2f8f34c56b
3 changed files with 64 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
addons/crm/crm_lead.py
View File

@ -42,11 +42,17 @@ class crm_lead(crm_case, osv.osv):
_order = "priority,date_action,id desc"
_inherit = ['mail.thread','res.partner.address']
def _read_group_stage_ids(self, cr, uid, ids, domain, context=None):
context = context or {}
def _read_group_stage_ids(self, cr, uid, ids, domain, read_group_order=None, context=None):
stage_obj = self.pool.get('crm.case.stage')
stage_ids = stage_obj.search(cr, uid, ['|', ('id','in',ids), ('case_default','=',1)], context=context)
return stage_obj.name_get(cr, uid, stage_ids, context=context)
order = stage_obj._order
if read_group_order == 'stage_id desc':
# lame hack to allow reverting search, should just work in the trivial case
order = "%s desc" % order
stage_ids = stage_obj.search(cr, uid, ['|', ('id','in',ids),('case_default','=',1)], order=order, context=context)
result = stage_obj.name_get(cr, uid, stage_ids, context=context)
# restore order of the search
result.sort(lambda x,y: cmp(stage_ids.index(x[0]), stage_ids.index(y[0])))
return result
_group_by_full = {
'stage_id': _read_group_stage_ids

14
addons/hr_recruitment/hr_recruitment.py
View File

@ -197,11 +197,17 @@ class hr_applicant(crm.crm_case, osv.osv):
'color': 0,
}
def _read_group_stage_ids(self, cr, uid, ids, domain, context=None):
context = context or {}
def _read_group_stage_ids(self, cr, uid, ids, domain, read_group_order=None, context=None):
stage_obj = self.pool.get('hr.recruitment.stage')
stage_ids = stage_obj.search(cr, uid, ['|',('id','in',ids), ('department_id','=',False)], context=context)
return stage_obj.name_get(cr, uid, stage_ids, context=context)
order = stage_obj._order
if read_group_order == 'stage_id desc':
# lame hack to allow reverting search, should just work in the trivial case
order = "%s desc" % order
stage_ids = stage_obj.search(cr, uid, ['|',('id','in',ids),('department_id','=',False)], order=order, context=context)
result = stage_obj.name_get(cr, uid, stage_ids, context=context)
# restore order of the search
result.sort(lambda x,y: cmp(stage_ids.index(x[0]), stage_ids.index(y[0])))
return result
_group_by_full = {
'stage_id': _read_group_stage_ids

55
addons/project/project.py
View File

@ -424,20 +424,53 @@ class task(osv.osv):
_log_create = True
_date_name = "date_start"
def _read_group_type_id(self, cr, uid, ids, domain, context=None):
stage_obj = self.pool.get('project.task.type')
stage_ids = stage_obj.search(cr, uid, ['|',('id','in',ids),('project_default','=',1)], context=context)
return stage_obj.name_get(cr, uid, stage_ids, context=context)
def _read_group_user_id(self, cr, uid, ids, domain, context=None):
def _resolve_project_id_from_context(self, cr, uid, context=None):
"""Return ID of project based on the value of 'project_id'
context key, or None if it cannot be resolved to a single project.
"""
if context is None: context = {}
if type(context.get('project_id')) in (int, long):
project_id = context['project_id']
return project_id
if isinstance(context.get('project_id'), basestring):
project_name = context['project_id']
project_ids = self.pool.get('project.project').name_search(cr, uid, name=project_name)
if len(project_ids) == 1:
return project_ids[0][0]
def _read_group_type_id(self, cr, uid, ids, domain, read_group_order=None, context=None):
stage_obj = self.pool.get('project.task.type')
project_id = self._resolve_project_id_from_context(cr, uid, context=context)
order = stage_obj._order
if read_group_order == 'type_id desc':
# lame way to allow reverting search, should just work in the trivial case
order = '%s desc' % order
if project_id:
domain = ['|', ('id','in',ids), ('project_ids','in',project_id)]
else:
domain = ['|', ('id','in',ids), ('project_default','=',1)]
stage_ids = stage_obj.search(cr, uid, domain, order=order, context=context)
result = stage_obj.name_get(cr, uid, stage_ids, context=context)
# restore order of the search
result.sort(lambda x,y: cmp(stage_ids.index(x[0]), stage_ids.index(y[0])))
return result
def _read_group_user_id(self, cr, uid, ids, domain, read_group_order=None, context=None):
res_users = self.pool.get('res.users')
if type(context.get('project_id')) not in (int, long):
return res_users.name_get(cr, uid, ids, context=context)
proj = self.pool.get('project.project').browse(cr, uid, context['project_id'], context=context)
ids += [x.id for x in proj.members]
user_ids = res_users.search(cr, uid, [('id','in',ids)], context=context)
return res_users.name_get(cr, uid, user_ids, context=context)
project_id = self._resolve_project_id_from_context(cr, uid, context=context)
if project_id:
ids += self.pool.get('project.project').read(cr, uid, project_id, ['members'], context=context)['members']
order = res_users._order
# lame way to allow reverting search, should just work in the trivial case
if read_group_order == 'user_id desc':
order = '%s desc' % order
# de-duplicate and apply search order
ids = res_users.search(cr, uid, [('id','in',ids)], order=order, context=context)
result = res_users.name_get(cr, uid, ids, context=context)
# restore order of the search
result.sort(lambda x,y: cmp(ids.index(x[0]), ids.index(y[0])))
return result
_group_by_full = {
'type_id': _read_group_type_id,