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

[MERGE] merged branch of sbh after resolved confilts

Browse Source 
bzr revid: hmo@tinyerp.com-20120703065218-1iprsuyq5n3bx71q
This commit is contained in:
Harry (OpenERP)
2012-07-03 12:22:18 +05:30
parent c449d53f0f 724dcc48d5
commit 9c0a210ae2
2 changed files with 127 additions and 43 deletions
Download Patch File Download Diff File Expand all files Collapse all files
addons/portal/wizard/portal_wizard.py
+123 -40
View File
@@ -35,7 +35,7 @@ _logger = logging.getLogger(__name__)
WELCOME_EMAIL_SUBJECT = _("Your OpenERP account at %(company)s")
WELCOME_EMAIL_BODY = _("""Dear %(name)s,
You have been created an OpenERP account at %(url)s.
You have been created an OpenERP account of %(portal)s at %(url)s.
Your login account data is:
Database: %(db)s
@@ -76,7 +76,7 @@ class wizard(osv.osv_memory):
"""
_name = 'res.portal.wizard'
_description = 'Portal Wizard'
_columns = {
'portal_id': fields.many2one('res.portal', required=True,
string='Portal',
@@ -89,24 +89,36 @@ class wizard(osv.osv_memory):
def _default_user_ids(self, cr, uid, context):
""" determine default user_ids from the active records """
if context is None:
context = {}
def check_portal_user(address):
#TOFIX: it should be check id instead of email
portal_id = context.get('portal_id', False)
if portal_id:
portal_users = self.pool.get('res.portal').browse(cr, uid, portal_id, context=context).group_id.users
active_user = [u.login for u in portal_users]
if address.email in active_user:
return True
return False
def create_user_from_address(address):
if isinstance(address, int):
res_partner_obj = self.pool.get('res.partner')
address = res_partner_obj.browse(cr, uid, address, context=context)
lang = address.id and address.lang or 'en_US'
partner_id = address.id
else:
lang = address.parent_id and address.parent_id.lang or 'en_US'
partner_id = address.parent_id and address.parent_id.id
return{
has_portal_user = check_portal_user(address)
return {
'name': address.name,
'user_email': extract_email(address.email),
'lang': lang,
'partner_id': partner_id,
}
'has_portal_user': has_portal_user,
}
user_ids = []
if context.get('active_model') == 'res.partner':
partner_obj = self.pool.get('res.partner')
@@ -120,66 +132,136 @@ class wizard(osv.osv_memory):
user_ids.extend(map(create_user_from_address, [p.id]))
else:
user_ids.append({'lang': p.lang or 'en_US', 'parent_id': p.id})
return user_ids
_defaults = {
'user_ids': _default_user_ids
}
def get_all_portal_user(self, cr):
all_portal_user_ids = []
portal_obj = self.pool.get('res.portal')
all_portals = portal_obj.browse(cr, ROOT_UID, portal_obj.search(cr, ROOT_UID, []))
all_portal_user = [p.group_id.users for p in all_portals]
for portal_user_id in all_portal_user:
all_portal_user_ids.extend([all_user.id for all_user in portal_user_id])
return all_portal_user_ids
def onchange_portal_id(self, cr, uid, ids, portal_id=False, context=None):
if not portal_id:
return {'value': {}}
user_obj = self.pool.get('res.users')
context.update({'portal_id':portal_id})
user_list = self._default_user_ids(cr, uid, context=context)
contact_user = [u['user_email'] for u in user_list if u.get('user_email', False)]
#add active portal user to portal wizard
portal_users = self.pool.get('res.portal').browse(cr,uid,portal_id).group_id.users
active_user =[]
for u in portal_users:
if u.partner_id.id == context['active_id'] and u.user_email not in contact_user:
active_user.append({
'name': u.name,
'user_email': u.user_email,
'lang': u.context_lang or 'en_US',
'partner_id': u.partner_id.id or False,
'has_portal_user':True,
})
if active_user:
user_list.extend(active_user)
return {'value': {'user_ids': user_list}}
def action_create(self, cr, uid, ids, context=None):
""" create new users in portal(s), and notify them by email """
# we copy the context to change the language for translating emails
context0 = context or {}
context0['noshortcut'] = True # prevent shortcut creation
context = context0.copy()
user_obj = self.pool.get('res.users')
user = user_obj.browse(cr, ROOT_UID, uid, context0)
if not user.user_email:
raise osv.except_osv(_('Email required'),
_('You must have an email address in your User Preferences'
' to send emails.'))
portal_obj = self.pool.get('res.portal')
for wiz in self.browse(cr, uid, ids, context):
if not wiz.user_ids:
raise osv.except_osv(_('User required'),
_('Create atleast one user for portal.'))
# determine existing users
login_cond = [('login', 'in', [u.user_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]
# create new users in portal (skip existing logins)
new_users_data = [ {
'name': u.name,
'login': u.user_email,
'password': random_password(),
'user_email': u.user_email,
'context_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 ]
portal_users = [portal_user.id for portal_user in wiz.portal_id.group_id.users]
add_users = []
remove_users = []
new_users_data = []
for u in wiz.user_ids:
login_cond = [('login', 'in', [u.user_email])]
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]
# create new users in portal (skip existing logins)
if existing_uids and existing_uids[0] not in portal_users or existing_uids and u.has_portal_user:
add_users.append(existing_uids[0])
if existing_uids and u.has_portal_user==False and existing_uids[0] in portal_users:
remove_users.append(existing_uids[0])
if u.user_email not in existing_logins:
new_users_data = [ {
'name': u.name,
'login': u.user_email,
'password': random_password(),
'user_email': u.user_email,
'context_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 new_user_data in new_users_data:
portal_obj.write(cr, ROOT_UID, [wiz.portal_id.id],
{'users': [(0, 0, new_user_data)]}, context0)
created_user = user_obj.search(cr, ROOT_UID, [('user_email','=', new_user_data['login']),('partner_id','=', new_user_data['partner_id'])])
add_users.append(created_user[0])
#add the user relationship in portal.
for add_user in add_users:
if add_user not in portal_users:
portal_users.append(add_user)
# add the existing user and new created USER
portal_obj.write(cr, ROOT_UID, [wiz.portal_id.id],
{'users': [(6, 0,portal_users)]}, context0)
#delete the user relationship from portal.
portal_obj.write(cr, ROOT_UID, [wiz.portal_id.id],
{'users': [(0, 0, data) for data in new_users_data]}, context0)
# send email to all users (translated in their language)
{'users': [(3, user_data) for user_data in remove_users]}, context0)
#unlink res user when portal user not in any portal.
all_portal_user = self.get_all_portal_user(cr)
user_obj.unlink(cr, ROOT_UID, [remove_user for remove_user in remove_users if remove_user not in all_portal_user])
data = {
'portal':wiz.portal_id.name,
'company': user.company_id.name,
'message': wiz.message or "",
'url': wiz.portal_id.url or _("(missing url)"),
'db': cr.dbname,
}
mail_message_obj = self.pool.get('mail.message')
dest_uids = user_obj.search(cr, ROOT_UID, login_cond)
dest_users = user_obj.browse(cr, ROOT_UID, dest_uids)
dest_users = []
for dest_uid in add_users:
if dest_uid not in portal_users:
dest_users.append(user_obj.browse(cr, ROOT_UID, dest_uid))
for dest_user in dest_users:
context['lang'] = dest_user.context_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
subject = _(WELCOME_EMAIL_SUBJECT) % data
@@ -188,13 +270,11 @@ class wizard(osv.osv_memory):
if not res:
_logger.warning(
'Failed to send email from %s to %s', email_from, email_to)
return {'type': 'ir.actions.act_window_close'}
wizard()
class wizard_user(osv.osv_memory):
"""
A model to configure users in the portal wizard.
@@ -210,13 +290,14 @@ class wizard_user(osv.osv_memory):
help="The user's real name"),
'user_email': fields.char(size=64, required=True,
string='Email',
help="Will be used as user login. "
help="Will be used as user login. "
"Also necessary to send the account information to new users"),
'lang': fields.selection(_lang_get, required=True,
string='Language',
help="The language for the user's user interface"),
'partner_id': fields.many2one('res.partner',
string='Partner'),
'has_portal_user':fields.boolean('Has portal access')
}
def _check_email(self, cr, uid, ids):
@@ -229,9 +310,11 @@ class wizard_user(osv.osv_memory):
(_check_email, 'Invalid email address', ['email']),
]
_defaults = {
'lang': lambda self,cr,uid,c: self.pool.get('res.users').browse(cr, uid, uid, c).partner_id.lang or 'en_US',
'partner_id': lambda self, cr, uid, ctx: ctx.get('partner_id', False),
}
wizard_user()
# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
addons/portal/wizard/portal_wizard_view.xml
+4 -3
View File
@@ -3,7 +3,7 @@
<data>
<!-- wizard action on res.partner -->
<act_window id="partner_wizard_action"
name="Add Portal Access"
name="Portal Access Management"
src_model="res.partner"
res_model="res.portal.wizard"
view_type="form" view_mode="form"
@@ -12,7 +12,7 @@
<!-- wizard view -->
<record id="wizard_view" model="ir.ui.view">
<field name="name">Add Portal Access</field>
<field name="name">Portal Access Management</field>
<field name="model">res.portal.wizard</field>
<field name="type">form</field>
<field name="arch" type="xml">
@@ -24,7 +24,7 @@
<button string="Cancel" class="oe_link" special="cancel" />
</header>
<group col="4">
<field name="portal_id" widget="selection"/>
<field name="portal_id" on_change="onchange_portal_id(portal_id,context)"/>
</group>
<field name="user_ids"/>
<label string="The following text will be included in the welcome email sent to users."/>
@@ -45,6 +45,7 @@
<field name="name"/>
<field name="user_email"/>
<field name="partner_id"/>
<field name="has_portal_user"/>
</tree>
</field>
</record>