pengyuthon/odoo_source
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[IMP] survey: onchange_multi_email

Browse Source 
bzr revid: chm@openerp.com-20130226102644-ddsr0pa81atwa9ja
This commit is contained in:
Christophe Matthieu
2013-02-26 11:26:44 +01:00
parent 6fa9834a25
commit f222f5f3bc
2 changed files with 22 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
addons/survey/wizard/survey_email_compose_message.py
+21 -10
View File
@@ -26,6 +26,8 @@ from datetime import datetime
from openerp.tools.translate import _
import uuid
emails_split = re.compile(r"[;,\n\r]+")
class survey_mail_compose_message(osv.TransientModel):
_name = 'survey.mail.compose.message'
@@ -70,6 +72,21 @@ class survey_mail_compose_message(osv.TransientModel):
_defaults = {
'public': 'email',
}
def onchange_multi_email(self, cr, uid, ids, multi_email, context=None):
emails = list(set(emails_split.split(multi_email or "")))
emails_checked = []
for email in emails:
email = email.strip()
if email:
if not re.search(r"^[^@]+@[^@]+$", email):
raise osv.except_osv(_('Warning!'), _("An email address is incorrect: '%s'" % email))
else:
emails_checked.append(email)
emails_checked.sort()
values = {'multi_email': '\n'.join(emails_checked)}
return {'value': values}
#------------------------------------------------------
# Wizard validation and send
#------------------------------------------------------
@@ -80,7 +97,6 @@ class survey_mail_compose_message(osv.TransientModel):
if context is None:
context = {}
emails_split = re.compile(r"[;,\n\r]+")
survey_response_obj = self.pool.get('survey.response')
partner_obj = self.pool.get('res.partner')
mail_mail_obj = self.pool.get('mail.mail')
@@ -139,18 +155,13 @@ class survey_mail_compose_message(osv.TransientModel):
emails = list(set(emails_split.split(wizard.multi_email or "")) - set([partner.email for partner in wizard.partner_ids]))
# quick check of email list
emails_checked = []
emails_list = []
for email in emails:
email = email.strip()
if email:
if not re.search(r"^[^@]+@[^@]+$", email):
raise osv.except_osv(_('Warning!'), _("An email address is incorrect: '%s'" % email))
else:
emails_checked.append(email)
if not len(emails_checked) and not len(wizard.partner_ids):
emails_list.append(email.strip())
if not len(emails_list) and not len(wizard.partner_ids):
raise osv.except_osv(_('Warning!'), _("Please enter at least one recipient."))
for email in emails_checked:
for email in emails_list:
partner_id = partner_obj.search(cr, uid, [('email', '=', email)], context=context)
partner_id = partner_id and partner_id[0] or None
token = create_token(wizard, partner_id, email)
addons/survey/wizard/survey_email_compose_message.xml
+1 -1
View File
@@ -49,7 +49,7 @@
<group col="1" attrs="{'invisible':['|',('public','=',False),('public','in',['public_link'])]}">
<group col="2">
<field string="List of partners" name="partner_ids" widget="many2many_tags_email" placeholder="Add contacts to notify..." context="{'force_email':True, 'show_email':True}"/>
<field name="multi_email"/>
<field name="multi_email" on_change="onchange_multi_email(multi_email, context)" no_resize="1"/>
<field name="subject" placeholder="Subject..."/>
</group>
<field name="body" help="__URL__ will be automatically transformed into web address (public or private, depending on your choice). You can click on 'Show Source' button to see __URL__ in the link tag on the email template."/>