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

[IMP] mail: remove auto_follow on user_id field. Replaced by partner suggestion on user_id, based on message_get_suggested_partners called in Chatter. Improved JS code, to handle various case (partner without email, email without partner, partner with email). 

bzr revid: tde@openerp.com-20130221184243-pu2tgtlanh34onpr
This commit is contained in:
Thibault Delavallée 2013-02-21 19:42:43 +01:00
parent c0b4bf55d8
commit 4c98128d11
3 changed files with 105 additions and 58 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
addons/crm/crm_lead.py
View File

@ -965,9 +965,9 @@ class crm_lead(base_stage, format_address, osv.osv):
recipients = super(crm_lead, self).message_get_suggested_recipients(cr, uid, ids, context=context)
for lead in self.browse(cr, uid, ids, context=context):
if lead.partner_id:
recipients[lead.id].append([lead.partner_id.id, '%s<%s>' % (lead.partner_id.name, lead.partner_id.email)])
elif lead.email_from:
recipients[lead.id].append([False, lead.email_from])
self._message_add_suggested_recipient(recipients, lead, partner=lead.partner_id, reason=_('Customer'))
if lead.email_from:
self._message_add_suggested_recipient(recipients, lead, email=lead.email_from, reason=_('Customer Email'))
return recipients
def message_new(self, cr, uid, msg, custom_values=None, context=None):

81
addons/mail/mail_thread.py
View File

@ -815,8 +815,29 @@ class mail_thread(osv.AbstractModel):
"now deprecated res.log.")
self.message_post(cr, uid, [id], message, context=context)
def _message_add_suggested_recipient(self, result, obj, partner=None, email=None, reason='', context=None):
if partner and partner in obj.message_follower_ids:
return result
if partner and partner in [val[0] for val in result[obj.id]]:
return result
if email and email in [val[1] for val in result[obj.id]]:
return result
if partner and partner.email:
result[obj.id].append((partner.id, '%s<%s>' % (partner.name, partner.email), reason))
elif partner:
result[obj.id].append((partner.id, '%s' % (partner.name), reason))
else:
result[obj.id].append((False, email, reason))
return result
def message_get_suggested_recipients(self, cr, uid, ids, context=None):
return dict.fromkeys(ids, list())
result = dict.fromkeys(ids, list())
if self._all_columns.get('user_id'):
for obj in self.browse(cr, SUPERUSER_ID, ids, context=context): # SUPERUSER because of a read on res.users that would crash otherwise IMHO
if not obj.user_id or not obj.user_id.partner_id:
continue
self._message_add_suggested_recipient(result, obj, partner=obj.user_id.partner_id, reason=self._all_columns['user_id'].column.string, context=context)
return result
def message_get_partner_info_from_emails(self, cr, uid, emails, link_mail=False, context=None):
""" Convert a list of emails into a list partner_ids and a list
@ -827,16 +848,17 @@ class mail_thread(osv.AbstractModel):
"""
mail_message_obj = self.pool.get('mail.message')
partner_obj = self.pool.get('res.partner')
partner_info = dict()
result = list()
for email in emails:
partner_info = {'full_name': email, 'partner_id': False}
m = re.search(r"((.+?)\s*<)?([^<>]+@[^<>]+)>?", email, re.IGNORECASE | re.DOTALL)
if not m:
continue
email_address = m.group(3)
partner_info.setdefault(email_address, dict()).setdefault('full_name', email)
ids = partner_obj.search(cr, SUPERUSER_ID, [('email', '=', email_address)], context=context)
if ids:
partner_info[email_address]['partner_id'] = ids[0]
else:
partner_info[email_address]['partner_id'] = False
partner_info['partner_id'] = ids[0]
result.append(partner_info)
# link mail with this from mail to the new partner id
if link_mail and ids:
@ -850,7 +872,7 @@ class mail_thread(osv.AbstractModel):
if message_ids:
# mail_message_obj.write(cr, SUPERUSER_ID, message_ids, {'author_id': ids[0]}, context=context)
print 'found', message_ids
return partner_info
return result
def message_post(self, cr, uid, thread_id, body='', subject=None,
content_subtype='html', type='notification', subtype=None,
@ -1037,22 +1059,22 @@ class mail_thread(osv.AbstractModel):
self.check_access_rights(cr, uid, 'write')
return self.write(cr, SUPERUSER_ID, ids, {'message_follower_ids': [(3, pid) for pid in partner_ids]}, context=context)
def _message_get_auto_subscribe_fields(self, cr, uid, updated_fields, auto_follow_fields=['user_id'], context=None):
""" Returns the list of relational fields linking to res.users that should
trigger an auto subscribe. The default list checks for the fields
- called 'user_id'
- linking to res.users
- with track_visibility set
In OpenERP V7, this is sufficent for all major addon such as opportunity,
project, issue, recruitment, sale.
Override this method if a custom behavior is needed about fields
that automatically subscribe users.
"""
user_field_lst = []
for name, column_info in self._all_columns.items():
if name in auto_follow_fields and name in updated_fields and getattr(column_info.column, 'track_visibility', False) and column_info.column._obj == 'res.users':
user_field_lst.append(name)
return user_field_lst
# def _message_get_auto_subscribe_fields(self, cr, uid, updated_fields, auto_follow_fields=['user_id'], context=None):
# """ Returns the list of relational fields linking to res.users that should
# trigger an auto subscribe. The default list checks for the fields
# - called 'user_id'
# - linking to res.users
# - with track_visibility set
# In OpenERP V7, this is sufficent for all major addon such as opportunity,
# project, issue, recruitment, sale.
# Override this method if a custom behavior is needed about fields
# that automatically subscribe users.
# """
# user_field_lst = []
# for name, column_info in self._all_columns.items():
# if name in auto_follow_fields and name in updated_fields and getattr(column_info.column, 'track_visibility', False) and column_info.column._obj == 'res.users':
# user_field_lst.append(name)
# return user_field_lst
def message_auto_subscribe(self, cr, uid, ids, updated_fields, context=None):
"""
@ -1063,7 +1085,7 @@ class mail_thread(osv.AbstractModel):
follower_obj = self.pool.get('mail.followers')
# fetch auto_follow_fields
user_field_lst = self._message_get_auto_subscribe_fields(cr, uid, updated_fields, context=context)
# user_field_lst = self._message_get_auto_subscribe_fields(cr, uid, updated_fields, context=context)
# fetch related record subtypes
related_subtype_ids = subtype_obj.search(cr, uid, ['|', ('res_model', '=', False), ('parent_id.res_model', '=', self._name)], context=context)
@ -1071,7 +1093,8 @@ class mail_thread(osv.AbstractModel):
default_subtypes = [subtype for subtype in subtypes if subtype.res_model == False]
related_subtypes = [subtype for subtype in subtypes if subtype.res_model != False]
relation_fields = set([subtype.relation_field for subtype in subtypes if subtype.relation_field != False])
if (not related_subtypes or not any(relation in updated_fields for relation in relation_fields)) and not user_field_lst:
# if (not related_subtypes or not any(relation in updated_fields for relation in relation_fields)) and not user_field_lst:
if not related_subtypes or not any(relation in updated_fields for relation in relation_fields):
return True
for record in self.browse(cr, uid, ids, context=context):
@ -1103,10 +1126,10 @@ class mail_thread(osv.AbstractModel):
for follower in follower_obj.browse(cr, SUPERUSER_ID, follower_ids, context=context):
new_followers.setdefault(follower.partner_id.id, set()).add(subtype.id)
# add followers coming from res.users relational fields that are tracked
user_ids = [getattr(record, name).id for name in user_field_lst if getattr(record, name)]
for partner_id in [user.partner_id.id for user in self.pool.get('res.users').browse(cr, SUPERUSER_ID, user_ids, context=context)]:
new_followers.setdefault(partner_id, None)
# # add followers coming from res.users relational fields that are tracked
# user_ids = [getattr(record, name).id for name in user_field_lst if getattr(record, name)]
# for partner_id in [user.partner_id.id for user in self.pool.get('res.users').browse(cr, SUPERUSER_ID, user_ids, context=context)]:
# new_followers.setdefault(partner_id, None)
for pid, subtypes in new_followers.items():
subtypes = list(subtypes) if subtypes is not None else None

76
addons/mail/static/src/js/mail.js
View File

@ -23,11 +23,15 @@ openerp.mail = function (session) {
/** parse text to find email: Tagada <address@mail.fr> -> [Tagada, address@mail.fr] or False */
parse_email: function (text) {
var email = text.match(/(.*)<(.*@.*)>/);
if (! email) {
return [text, false];
var result = text.match(/(.*)<(.*@.*)>/);
if (result) {
return [_.str.trim(result[1]), _.str.trim(result[2])];
}
return [_.str.trim(email[1]), email[2]];
result = text.match(/(.*@.*)/);
if (result) {
return [_.str.trim(result[1]), _.str.trim(result[1])];
}
return [text, false];
},
/* Get an image in /web/binary/image?... */
@ -592,37 +596,43 @@ openerp.mail = function (session) {
check_recipient_partners: function () {
var self = this;
var check_done = $.Deferred();
var recipients = _.filter(this.recipients, function (recipient) { return recipient.checked });
var recipients_to_check = _.filter(recipients, function (recipient) { return (! recipient.partner_id || ! recipient.email_address) });
var names_to_check = _.pluck(recipients_to_check, 'full_name');
var names_to_remove = [];
var recipients_to_find = _.filter(recipients, function (recipient) { return (! recipient.partner_id) });
var names_to_find = _.pluck(recipients_to_find, 'full_name');
var recipients_to_check = _.filter(recipients, function (recipient) { return (recipient.partner_id && ! recipient.email_address) });
var recipient_ids = _.pluck(_.filter(recipients, function (recipient) { return recipient.partner_id && recipient.email_address }), 'partner_id');
var names_to_remove = [];
var recipient_ids_to_remove = [];
// some debug
console.group('check_recipient_partners');
console.log('recipients', recipients);
console.log('recipient_ids', recipient_ids);
console.log('recipients_to_find', recipients_to_find);
console.log('recipients_to_check', recipients_to_check);
console.log('names_to_check', names_to_check);
console.log('names_to_find', names_to_find);
// no emails -> do not make call, proceed to next step
if (names_to_check.length == 0) {
console.groupEnd();
return check_done.resolve(recipient_ids);
// have unknown names -> call message_get_partner_info_from_emails to try to find partner_id
var find_done = $.Deferred();
if (names_to_find.length > 0) {
find_done = self.parent_thread.ds_thread._model.call('message_get_partner_info_from_emails', [names_to_find]);
}
else {
find_done.resolve([]);
}
// for each unknown email -> filter already existing partners
self.parent_thread.ds_thread._model.call('message_get_partner_info_from_emails', [names_to_check]).done(function (result) {
// for unknown names + incomplete partners -> open popup - cancel = remove from recipients
$.when(find_done).pipe(function (result) {
var emails_deferred = [];
_.each(result, function (partner_info) {
var recipient_popups = result.concat(recipients_to_check);
_.each(recipient_popups, function (partner_info) {
var deferred = $.Deferred()
emails_deferred.push(deferred);
var partner_name = partner_info.full_name;
var partner_id = partner_info.partner_id;
var parsed_email = mail.ChatterUtils.parse_email(partner_name);
console.log('checking', partner_name, 'parsed email', parsed_email);
var pop = new session.web.form.FormOpenPopup(this);
pop.show_element(
@ -641,22 +651,36 @@ openerp.mail = function (session) {
});
pop.view_form.on('on_button_cancel', self, function () {
names_to_remove.push(partner_name);
if (partner_id) {
recipient_ids_to_remove.push(partner_id);
}
});
});
$.when.apply($, emails_deferred).then(function () {
console.log('post truc', names_to_remove);
var new_names_to_check = _.difference(names_to_check, names_to_remove);
self.parent_thread.ds_thread._model.call('message_get_partner_info_from_emails', [new_names_to_check, true]).done(function (result) {
_.each(result, function (partner_info) {
recipient_ids.push(partner_info.partner_id);
console.log('final call', names_to_remove, recipient_ids_to_remove);
var new_names_to_find = _.difference(names_to_find, names_to_remove);
find_done = $.Deferred();
if (new_names_to_find.length > 0) {
find_done = self.parent_thread.ds_thread._model.call('message_get_partner_info_from_emails', [new_names_to_find, true]);
}
else {
find_done.resolve([]);
}
$.when(find_done).pipe(function (result) {
var recipient_popups = result.concat(recipients_to_check);
_.each(recipient_popups, function (partner_info) {
if (partner_info.partner_id && _.indexOf(partner_info.partner_id, recipient_ids_to_remove) == -1) {
recipient_ids.push(partner_info.partner_id);
}
});
}).pipe(function (caca) {
console.log('caca', caca);
}).pipe(function () {
check_done.resolve(recipient_ids);
console.groupEnd();
});
});
});
console.groupEnd();
return check_done;
},
@ -714,7 +738,7 @@ openerp.mail = function (session) {
/* Quick composer: toggle minimal / expanded mode
* - toggle minimal (one-liner) / expanded (textarea, buttons) mode
* - when going into expanded mode:
* - call `message_get_suggested_partners` to have a list of partners to add
* - call `message_get_suggested_recipients` to have a list of partners to add
* - compute email_from list (list of unknown email_from to propose to create partners)
*/
on_toggle_quick_composer: function (event) {