Thibault Delavallée (OpenERP) has proposed merging
lp:~openerp-dev/openobject-addons/trunk-openchatter-3-5-user-partner-tde into
lp:openobject-addons.
Requested reviews:
OpenERP Core Team (openerp)
For more details, see:
https://code.launchpad.net/~openerp-dev/openobject-addons/trunk-openchatter-3-5-user-partner-tde/+merge/119096
OpenChatter3.5 'I am not dead! - Ere, he says he's not dead. - Yes he is. - I'm
not.': res.users inherits from res.partner part of the task.
Refactoring of res.users model: it now inherits (and I do insist on the 's',
because it's kewl) from res.partner. This addons-side branch holds the change
related to the field name change: context_lang -> lang, context_tz -> tz,
user_email > email. The latter one generates a big diff but was necessary to
clean the variable name.
--
https://code.launchpad.net/~openerp-dev/openobject-addons/trunk-openchatter-3-5-user-partner-tde/+merge/119096
Your team OpenERP R&D Team is subscribed to branch
lp:~openerp-dev/openobject-addons/trunk-openchatter-3-5-user-partner-tde.
=== modified file 'portal/wizard/portal_wizard.py'
--- portal/wizard/portal_wizard.py 2012-06-28 12:36:18 +0000
+++ portal/wizard/portal_wizard.py 2012-08-10 09:05:25 +0000
@@ -26,7 +26,7 @@
from tools.misc import email_re
from tools.translate import _
-from base.res.res_users import _lang_get
+from base.res.res_partner import _lang_get
_logger = logging.getLogger(__name__)
@@ -62,9 +62,9 @@
random.shuffle(chars)
return ''.join(chars)
-def extract_email(user_email):
+def extract_email(email):
""" extract the email address from a user-friendly email address """
- m = email_re.search(user_email or "")
+ m = email_re.search(email or "")
return m and m.group(0) or ""
@@ -102,7 +102,7 @@
return{
'name': address.name,
- 'user_email': extract_email(address.email),
+ 'email': extract_email(address.email),
'lang': lang,
'partner_id': partner_id,
}
@@ -136,7 +136,7 @@
user_obj = self.pool.get('res.users')
user = user_obj.browse(cr, ROOT_UID, uid, context0)
- if not user.user_email:
+ if not user.email:
raise osv.except_osv(_('Email required'),
_('You must have an email address in your User Preferences'
' to send emails.'))
@@ -144,7 +144,7 @@
portal_obj = self.pool.get('res.portal')
for wiz in self.browse(cr, uid, ids, context):
# determine existing users
- login_cond = [('login', 'in', [u.user_email for u in wiz.user_ids])]
+ login_cond = [('login', 'in', [u.email for u in wiz.user_ids])]
existing_uids = user_obj.search(cr, ROOT_UID, login_cond)
existing_users = user_obj.browse(cr, ROOT_UID, existing_uids)
existing_logins = [u.login for u in existing_users]
@@ -152,15 +152,15 @@
# create new users in portal (skip existing logins)
new_users_data = [ {
'name': u.name,
- 'login': u.user_email,
+ 'login': u.email,
'password': random_password(),
- 'user_email': u.user_email,
- 'context_lang': u.lang,
+ 'email': u.email,
+ 'lang': u.lang,
'share': True,
'action_id': wiz.portal_id.home_action_id and wiz.portal_id.home_action_id.id or False,
'partner_id': u.partner_id and u.partner_id.id,
'groups_id': [(6, 0, [])],
- } for u in wiz.user_ids if u.user_email not in existing_logins ]
+ } for u in wiz.user_ids if u.email not in existing_logins ]
portal_obj.write(cr, ROOT_UID, [wiz.portal_id.id],
{'users': [(0, 0, data) for data in new_users_data]}, context0)
@@ -175,13 +175,13 @@
dest_uids = user_obj.search(cr, ROOT_UID, login_cond)
dest_users = user_obj.browse(cr, ROOT_UID, dest_uids)
for dest_user in dest_users:
- context['lang'] = dest_user.context_lang
+ context['lang'] = dest_user.lang
data['login'] = dest_user.login
data['password'] = dest_user.password
data['name'] = dest_user.name
- email_from = user.user_email
- email_to = dest_user.user_email
+ email_from = user.email
+ email_to = dest_user.email
subject = _(WELCOME_EMAIL_SUBJECT) % data
body = _(WELCOME_EMAIL_BODY) % data
res = mail_message_obj.schedule_with_attach(cr, uid, email_from , [email_to], subject, body, context=context)
@@ -208,7 +208,7 @@
'name': fields.char(size=64, required=True,
string='User Name',
help="The user's real name"),
- 'user_email': fields.char(size=64, required=True,
+ 'email': fields.char(size=64, required=True,
string='Email',
help="Will be used as user login. "
"Also necessary to send the account information to new users"),
@@ -222,7 +222,7 @@
def _check_email(self, cr, uid, ids):
""" check syntax of email address """
for wuser in self.browse(cr, uid, ids):
- if not email_re.match(wuser.user_email): return False
+ if not email_re.match(wuser.email): return False
return True
_constraints = [
_______________________________________________
Mailing list: https://launchpad.net/~openerp-dev-gtk
Post to : [email protected]
Unsubscribe : https://launchpad.net/~openerp-dev-gtk
More help : https://help.launchpad.net/ListHelp
