[IMP] portal managment: add get_error_messages method

bzr revid: chm@openerp.com-20130521144941-a0pfm3ulx7wr5cs1

2 files changed, 18 insertions, 16 deletions

diff --git a/addons/portal/wizard/portal_wizard.py b/addons/portal/wizard/portal_wizard.py
index 4c513d0ec2f..dd07f85d3a5 100644
--- a/addons/portal/wizard/portal_wizard.py
+++ b/addons/portal/wizard/portal_wizard.py
@@ -116,21 +116,20 @@ class wizard_user(osv.osv_memory):
     _description = 'Portal User Config'
 
     _columns = {
-        'wizard_id': fields.many2one('portal.wizard', string='Wizard', required=True),
+        'wizard_id': fields.many2one('portal.wizard', string='Wizard', required=True, ondelete='cascade'),
         'partner_id': fields.many2one('res.partner', string='Contact', required=True, readonly=True),
         'email': fields.char(size=240, string='Email'),
         'in_portal': fields.boolean('In Portal'),
     }
 
-    def action_apply(self, cr, uid, ids, context=None):
+    def get_error_messages(self, cr, uid, ids, context=None):
         res_users = self.pool.get('res.users')
-        wizards = self.browse(cr, SUPERUSER_ID, ids, context)
         emails = []
         error_empty = []
         error_emails = []
         error_user = []
         ctx = dict(context or {}, active_test=False)
-        for wizard_user in wizards:
+        for wizard_user in self.browse(cr, SUPERUSER_ID, ids, context):
             if wizard_user.in_portal:
                 email = extract_email(wizard_user.email)
                 if not email:
@@ -144,19 +143,24 @@ class wizard_user(osv.osv_memory):
 
         error_msg = []
         if error_empty:
-            error_msg.append("%s\n%r" % (_("Some contacts don't have valid email address: "), [p.display_name for p in error_empty]))
+            error_msg.append("%s\n%s" % (_("Some contacts don't have valid email address: "), '\n'.join([p.display_name for p in error_empty])))
         if error_emails:
-            error_msg.append("%s\n%r" % (_("You have more than one email address equal to:"), error_emails))
+            error_msg.append("%s\n%s" % (_("You have more than one email address equal to:"), '\n'.join(error_emails)))
         if error_user:
             error_msg.append("%s\n%s" % (_("Some contact have the same email address than an other contact who have already an user's access:"),
-                                (error_msg, [(p_u[0].id, p_u[0].name, '=>', p_u[1].id, p_u[1].name) for p_u in error_user])))
+                                '\n'.join([(p_u[0].id, p_u[0].name, '=>', p_u[1].id, p_u[1].name) for p_u in error_user])))
         if error_msg:
             error_msg.append(_("To resolve this error, you can:\
                 Change and use an other contact's email adresse;  \
                 Select other contacts; "))
+        return error_msg
+
+    def action_apply(self, cr, uid, ids, context=None):
+        error_msg = self.get_error_messages(cr, uid, ids, context=context)
+        if error_msg:
             raise osv.except_osv(_('Contacts Error'), "\n\n".join(error_msg))
 
-        for wizard_user in wizards:
+        for wizard_user in self.browse(cr, SUPERUSER_ID, ids, context):
             portal = wizard_user.wizard_id.portal_id
             user = self._retrieve_user(cr, SUPERUSER_ID, wizard_user, context)
             if wizard_user.partner_id.email != wizard_user.email:
diff --git a/addons/portal_crm/wizard/portal_wizard.py b/addons/portal_crm/wizard/portal_wizard.py
index 7c43310dce7..e74a975ee58 100644
--- a/addons/portal_crm/wizard/portal_wizard.py
+++ b/addons/portal_crm/wizard/portal_wizard.py
@@ -26,16 +26,14 @@ from openerp.tools.translate import _
 
 _logger = logging.getLogger(__name__)
 
+
 class wizard_user(osv.osv_memory):
     _inherit = 'portal.wizard.user'
 
-    def action_apply(self, cr, uid, ids, context=None):
-        try:
-            return super(wizard_user, self).action_apply(cr, uid, ids, context)
-        except osv.except_osv, e:
-            if "Contact" in e[0]:
-                raise osv.except_osv(e[0], "%s %s" % (e[1], _("Use the partner merge action (more option of the contacts list) to merge the identical partners.")))
-            else:
-                raise e
+    def get_error_messages(self, cr, uid, ids, context=None):
+        error_msg = super(wizard_user, self).get_error_messages(cr, uid, ids, context)
+        if error_msg:
+            error_msg[-1] = '%s %s' % (error_msg[-1], _("Use the partner merge action (more option of the contacts list) to merge the identical partners."))
+        return error_msg
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: