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

[IMP] mail.alias: fix copy() errors for inheriting models 

bzr revid: odo@openerp.com-20120807140821-xijunvy5d546o8c6
This commit is contained in:
Olivier Dony 2012-08-07 16:08:21 +02:00
parent 394f4e55cd
commit 675ed5e84f
4 changed files with 21 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
addons/crm/crm.py
View File

@ -162,16 +162,16 @@ class crm_case_section(osv.osv):
return res
def create(self, cr, uid, vals, context=None):
alias_pool = self.pool.get('mail.alias')
mail_alias = self.pool.get('mail.alias')
if not vals.get('alias_id'):
name = vals.pop('alias_name', None) or vals['name']
alias_id = alias_pool.create_unique_alias(cr, uid,
{'alias_name': name},
vals.pop('alias_name', None) # prevent errors during copy()
alias_id = mail_alias.create_unique_alias(cr, uid,
{'alias_name': vals['name']},
model_name="crm.lead",
context=context)
vals['alias_id'] = alias_id
res = super(crm_case_section, self).create(cr, uid, vals, context)
alias_pool.write(cr, uid, [vals['alias_id']],{'alias_defaults':{'section_id': res,'type':'lead'}},context)
mail_alias.write(cr, uid, [vals['alias_id']], {'alias_defaults': {'section_id': res, 'type':'lead'}}, context)
return res
def unlink(self, cr, uid, ids, context=None):

14
addons/mail/mail_group.py
View File

@ -163,15 +163,17 @@ class mail_group(osv.osv):
return self.message_subscribe(cr, uid, ids, user_ids, context=context)
def create(self, cr, uid, vals, context=None):
alias_pool = self.pool.get('mail.alias')
mail_alias = self.pool.get('mail.alias')
if not vals.get('alias_id'):
name = vals.get('alias_name') or vals['name']
alias_id = alias_pool.create_unique_alias(cr, uid,
{'alias_name': "group_"+name},
model_name=self._name, context=context)
vals.pop('alias_name', None) # prevent errors during copy()
alias_id = mail_alias.create_unique_alias(cr, uid,
# Using '+' allows using subaddressing for those who don't
# have a catchall domain setup.
{'alias_name': "group+"+vals['name']},
model_name=self._name, context=context)
vals['alias_id'] = alias_id
mail_group_id = super(mail_group, self).create(cr, uid, vals, context)
alias_pool.write(cr, uid, [vals['alias_id']], {"alias_force_thread_id": mail_group_id}, context)
mail_alias.write(cr, uid, [vals['alias_id']], {"alias_force_thread_id": mail_group_id}, context)
if vals.get('group_ids'):
self._subscribe_user_with_group_m2m_command(cr, uid, [mail_group_id], vals.get('group_ids'), context=context)

4
addons/mail/res_users.py
View File

@ -86,13 +86,13 @@ class res_users(osv.osv):
cr.execute('ALTER TABLE res_users ALTER COLUMN alias_id SET NOT NULL')
except Exception:
pass
def create(self, cr, uid, data, context=None):
# create default alias same as the login
mail_alias = self.pool.get('mail.alias')
alias_id = mail_alias.create_unique_alias(cr, uid, {'alias_name': data['login']}, model_name=self._name, context=context)
data['alias_id'] = alias_id
data.pop('alias_name', None) # prevent errors during copy()
user_id = super(res_users, self).create(cr, uid, data, context=context)
mail_alias.write(cr, SUPERUSER_ID, [alias_id], {"alias_force_thread_id": user_id}, context)

10
addons/project/project.py
View File

@ -524,11 +524,13 @@ def Project():
def create(self, cr, uid, vals, context=None):
mail_alias = self.pool.get('mail.alias')
if not vals.get('alias_id'):
name = vals.pop('alias_name', None) or vals['name']
vals.pop('alias_name', None) # prevent errors during copy()
alias_id = mail_alias.create_unique_alias(cr, uid,
{'alias_name': "project_"+short_name(name)},
model_name=vals.get('alias_model', 'project.task'),
context=context)
# Using '+' allows using subaddressing for those who don't
# have a catchall domain setup.
{'alias_name': "project+"+vals['name']},
model_name=vals.get('alias_model', 'project.task'),
context=context)
vals['alias_id'] = alias_id
project_id = super(project, self).create(cr, uid, vals, context)
mail_alias.write(cr, uid, [vals['alias_id']], {'alias_defaults': {'project_id': project_id} }, context)