From e78f5d33f99ec4e6875040de626b11206ac7319b Mon Sep 17 00:00:00 2001 From: "Atul Patel (OpenERP)" Date: Mon, 11 Apr 2011 13:08:23 +0530 Subject: [PATCH] [IMP]: Improve code for attendees in sugarcrm bzr revid: atp@tinyerp.com-20110411073823-qp1t4mw6e26tb5ww --- addons/import_sugarcrm/import_sugarcrm.py | 8 ++++---- addons/import_sugarcrm/sugar.py | 12 +++++------- 2 files changed, 9 insertions(+), 11 deletions(-) diff --git a/addons/import_sugarcrm/import_sugarcrm.py b/addons/import_sugarcrm/import_sugarcrm.py index 44c67621dbf..b2fba2005c9 100644 --- a/addons/import_sugarcrm/import_sugarcrm.py +++ b/addons/import_sugarcrm/import_sugarcrm.py @@ -464,9 +464,9 @@ def get_attendee_id(sugar_obj, cr, uid, PortType, sessionid, module_name, module model_obj = sugar_obj.pool.get('ir.model.data') att_obj = sugar_obj.pool.get('calendar.attendee') meeting_obj = sugar_obj.pool.get('crm.meeting') - user_xml_ids, user_email_ids = sugar.user_get_attendee_list(PortType, sessionid, module_name, module_id) - for user_xml_id in user_xml_ids: - user_model_ids = find_mapped_id(sugar_obj, cr, uid, 'res.users', user_xml_id, context) + user_dict = sugar.user_get_attendee_list(PortType, sessionid, module_name, module_id) + for user in user_dict: + user_model_ids = find_mapped_id(sugar_obj, cr, uid, 'res.users', user.get('id'), context) user_resource_id = model_obj.browse(cr, uid, user_model_ids) if user_resource_id: user_id = user_resource_id[0].res_id @@ -474,7 +474,7 @@ def get_attendee_id(sugar_obj, cr, uid, PortType, sessionid, module_name, module if attend_ids: attendees = attend_ids[0] else: - attendees = att_obj.create(cr, uid, {'user_id': user_id, 'email': user_email_ids[0]}) + attendees = att_obj.create(cr, uid, {'user_id': user_id, 'email': user.get('email1')}) meeting_model_ids = find_mapped_id(sugar_obj, cr, uid, 'crm.meeting', module_id, context) meeting_xml_id = model_obj.browse(cr, uid, meeting_model_ids) if meeting_xml_id: diff --git a/addons/import_sugarcrm/sugar.py b/addons/import_sugarcrm/sugar.py index 8b25c5ec974..0ec87238e77 100644 --- a/addons/import_sugarcrm/sugar.py +++ b/addons/import_sugarcrm/sugar.py @@ -71,16 +71,14 @@ def user_get_attendee_list(portType, sessionid, module_name=None, module_id=None list = se_resp.get_element_return() arch = base64.decodestring(list.Result) eview = False - attende_id = [] - attende_email_id = [] eview = etree.XML(arch) + attendee_list = [] for child in eview: + attendee_dict = {} for ch in child.getchildren(): - if ch.tag == 'id': - attende_id.append(ch.text) - if ch.tag == 'email1': - attende_email_id.append(ch.text) - return attende_id,attende_email_id + attendee_dict[ch.tag] = ch.text + attendee_list.append(attendee_dict) + return attendee_list def search(portType, sessionid, module_name=None):