From 9abe80dbafedce6b878fccec5515adb8caceaf46 Mon Sep 17 00:00:00 2001 From: Raphael Collet Date: Mon, 26 Mar 2012 14:07:00 +0200 Subject: [PATCH] [IMP] fetchmail, crm, crm_claim, project_issue: factor the configuration of a fetchmail server for leads, claims and issues bzr revid: rco@openerp.com-20120326120700-ha611uzpnayf91y4 --- addons/crm/res_config.py | 80 ++----------- addons/crm/res_config_view.xml | 16 +-- addons/crm_claim/res_config.py | 19 ++- addons/crm_claim/res_config_view.xml | 16 +-- addons/fetchmail/res_config.py | 141 +++++++++++++++-------- addons/project_issue/res_config.py | 20 ++-- addons/project_issue/res_config_view.xml | 16 +-- 7 files changed, 141 insertions(+), 167 deletions(-) diff --git a/addons/crm/res_config.py b/addons/crm/res_config.py index 66b83a75f18..244496ee377 100644 --- a/addons/crm/res_config.py +++ b/addons/crm/res_config.py @@ -22,25 +22,27 @@ from osv import fields, osv class crm_configuration(osv.osv_memory): - _inherit = 'sale.config.settings' + _name = 'sale.config.settings' + _inherit = ['sale.config.settings', 'fetchmail.config.settings'] _columns = { 'module_crm_caldav': fields.boolean("Caldav Synchronization", help="""Use protocol caldav to synchronize meetings with other calendar applications (like Sunbird). This installs the module crm_caldav."""), - 'fetchmail_crm': fields.boolean("Lead/Opportunity mail gateway", - help="Create leads automatically from an email gateway."), - 'default_server': fields.char('Server Name', size=256), - 'default_port': fields.integer('Port'), - 'default_type': fields.selection([ + 'fetchmail_lead': fields.boolean("Create leads from an email account", + fetchmail_model='crm.lead', fetchmail_name='Incoming leads', + help="""Allows you to configure your incoming mail server, and create leads from incoming emails."""), + 'lead_server': fields.char('Server Name', size=256), + 'lead_port': fields.integer('Port'), + 'lead_type': fields.selection([ ('pop', 'POP Server'), ('imap', 'IMAP Server'), ('local', 'Local Server'), ], 'Server Type'), - 'default_is_ssl': fields.boolean('SSL/TLS', + 'lead_is_ssl': fields.boolean('SSL/TLS', help="Connections are encrypted with SSL/TLS through a dedicated port (default: IMAPS=993, POP=995)"), - 'default_user': fields.char('Username', size=256), - 'default_password': fields.char('Password', size=1024), + 'lead_user': fields.char('Username', size=256), + 'lead_password': fields.char('Password', size=1024), 'module_import_sugarcrm': fields.boolean("SugarCRM Import", help="""Import SugarCRM leads, opportunities, users, accounts, contacts, employees, meetings, phonecalls, emails, project and project tasks data. This installs the module import_sugarcrm."""), @@ -62,65 +64,7 @@ class crm_configuration(osv.osv_memory): } _defaults = { - 'default_type': 'pop', + 'lead_type': 'pop', } - def onchange_server_type(self, cr, uid, ids, server_type, ssl, context=None): - values = {} - if server_type == 'pop': - values['default_port'] = ssl and 995 or 110 - elif server_type == 'imap': - values['default_port'] = ssl and 993 or 143 - else: - values['default_server'] = False - values['default_port'] = 0 - return {'value': values} - - def get_default_email_configurations(self, cr, uid, ids, context=None): - ir_values = self.pool.get('ir.values') - server_count = self.pool.get('fetchmail.server').search(cr, uid, - [('name','=','Incoming Leads'), ('state','=','done')], count=True) - return { - 'fetchmail_crm': bool(server_count), - 'default_server': ir_values.get_default(cr, uid, 'fetchmail.server', 'server') or False, - 'default_port': ir_values.get_default(cr, uid, 'fetchmail.server', 'port') or False, - 'default_type': ir_values.get_default(cr, uid, 'fetchmail.server', 'type') or False, - 'default_is_ssl': ir_values.get_default(cr, uid, 'fetchmail.server', 'is_ssl') or False, - 'default_user': ir_values.get_default(cr, uid, 'fetchmail.server', 'user') or False, - 'default_password': ir_values.get_default(cr, uid, 'fetchmail.server', 'password') or False, - } - - def set_email_configurations(self, cr, uid, ids, context=None): - ir_values = self.pool.get('ir.values') - fetchmail_obj = self.pool.get('fetchmail.server') - config = self.browse(cr, uid, ids[0], context) - model_ids = self.pool.get('ir.model').search(cr, uid, [('model', '=', 'crm.lead')]) - if config.fetchmail_crm and model_ids: - fetchmail_vals = { - 'name': 'Incoming Leads', - 'object_id': model_ids[0], - 'server': config.default_server, - 'port': config.default_port, - 'is_ssl': config.default_is_ssl, - 'type': config.default_type, - 'user': config.default_user, - 'password': config.default_password, - } - server_ids = fetchmail_obj.search(cr, uid, [('name','=','Incoming Leads'), ('state','=','done')]) - if not server_ids: - server_ids = [fetchmail_obj.create(cr, uid, fetchmail_vals, context=context)] - else: - server_ids = fetchmail_obj.search(cr, uid, [('name','=','Incoming Leads')], context=context) - fetchmail_obj.write(cr, uid, server_ids, fetchmail_vals, context=context) - fetchmail_obj.button_confirm_login(cr, uid, server_ids, context=None) - ir_values.set_default(cr, uid, 'fetchmail.server', 'server', config.default_server) - ir_values.set_default(cr, uid, 'fetchmail.server', 'port', config.default_port) - ir_values.set_default(cr, uid, 'fetchmail.server', 'is_ssl', config.default_is_ssl) - ir_values.set_default(cr, uid, 'fetchmail.server', 'type', config.default_type) - ir_values.set_default(cr, uid, 'fetchmail.server', 'user', config.default_user) - ir_values.set_default(cr, uid, 'fetchmail.server', 'password', config.default_password) - else: - server_ids = fetchmail_obj.search(cr, uid, [('name','=','Incoming Leads'), ('state','=','done')]) - fetchmail_obj.set_draft(cr, uid, server_ids, context=None) - # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: diff --git a/addons/crm/res_config_view.xml b/addons/crm/res_config_view.xml index b97fc110166..445c81f924c 100644 --- a/addons/crm/res_config_view.xml +++ b/addons/crm/res_config_view.xml @@ -10,14 +10,14 @@ - - - - - - - - + + + + + + + + diff --git a/addons/crm_claim/res_config.py b/addons/crm_claim/res_config.py index 428b8a3dd57..37a0f49da99 100644 --- a/addons/crm_claim/res_config.py +++ b/addons/crm_claim/res_config.py @@ -21,10 +21,13 @@ from osv import osv, fields -class project_claim_mail_configuration(osv.osv_memory): - _inherit = 'project.config.settings' +class crm_claim_settings(osv.osv_memory): + _name = 'project.config.settings' + _inherit = ['project.config.settings', 'fetchmail.config.settings'] + _columns = { - 'project_claim': fields.boolean("Create claims from an email account", + 'fetchmail_claim': fields.boolean("Create claims from an email account", + fetchmail_model='crm.claim', fetchmail_name='Incoming claims', help="""Allows you to configure your incoming mail server, and create claims from incoming emails."""), 'claim_server' : fields.char('Server Name', size=256), 'claim_port' : fields.integer('Port'), @@ -37,15 +40,7 @@ class project_claim_mail_configuration(osv.osv_memory): 'claim_user' : fields.char('Username', size=256), 'claim_password' : fields.char('Password', size=1024), } + _defaults = { 'claim_type': 'pop', } - - def get_default_claim_server(self, cr, uid, ids, context=None): - context.update({'type':'claim'}) - res = self.get_default_email_configurations(cr, uid, ids, context) - return res - - def set_default_claim_server(self, cr, uid, ids, context=None): - context.update({'type':'claim','obj':'crm.claim'}) - self.set_email_configurations(cr, uid, ids, context) diff --git a/addons/crm_claim/res_config_view.xml b/addons/crm_claim/res_config_view.xml index 7ea61684a4c..727032474fc 100644 --- a/addons/crm_claim/res_config_view.xml +++ b/addons/crm_claim/res_config_view.xml @@ -9,14 +9,14 @@ - - - - - - - - + + + + + + + + diff --git a/addons/fetchmail/res_config.py b/addons/fetchmail/res_config.py index dcfdbb137ce..9f60d77d4ad 100644 --- a/addons/fetchmail/res_config.py +++ b/addons/fetchmail/res_config.py @@ -22,61 +22,102 @@ from osv import fields, osv -class project_configuration(osv.osv_memory): - _inherit = 'project.config.settings' +class fetchmail_config_settings(osv.osv_memory): + """ This wizard can be inherited in conjunction with 'res.config.settings', in order to + define fields that configure a fetchmail server. - def get_default_email_configurations(self, cr, uid, ids, context=None): - fetchmail_obj = self.pool.get('fetchmail.server') - result = {} - if not context: - context = {} - type = context.get('type') - if type: - server_ids = fetchmail_obj.search(cr, uid, [('name','=',type),('state','=','done')]) - if server_ids: - result.update({'project_'+type: True}) - server_id = fetchmail_obj.browse(cr, uid, server_ids[0]) - result.update({type+'_server': server_id.server}) - result.update({type+'_port': server_id.port}) - result.update({type+'_is_ssl': server_id.is_ssl}) - result.update({type+'_type': server_id.type}) - result.update({type+'_user': server_id.user}) - result.update({type+'_password': server_id.password}) + It relies on the following convention on a set of fields:: - return result + class my_config_wizard(osv.osv_memory): + _name = 'my.settings' + _inherits = ['res.config.settings', 'fetchmail.config.settings'] - def set_email_configurations(self, cr, uid, ids, context=None): - model_obj = self.pool.get('ir.model') - fetchmail_obj = self.pool.get('fetchmail.server') - ir_values_obj = self.pool.get('ir.values') - if not context: - context = {} - type = context.get('type') - model = context.get('obj') - if type and model: - object_id = model_obj.search(cr, uid, [('model','=',model)]) - vals = self.read(cr, uid, ids[0], [], context=context) - if vals.get('project_'+type) and object_id: - server_vals = { - 'name': type, - 'object_id': object_id[0], - 'server': vals.get(type+'_server'), - 'port': vals.get(type+'_port'), - 'is_ssl': vals.get(type+'_is_ssl'), - 'type': vals.get(type+'_type'), - 'user': vals.get(type+'_user'), - 'password': vals.get(type+'_password') + _columns = { + 'fetchmail_X': fields.boolean(..., fetchmail_model='my.model', fetchmail_name='Blah'), + 'X_server': fields.char('Server Name', size=256), + 'X_port': fields.integer('Port'), + 'X_type': fields.selection( + [('pop', 'POP Server'), ('imap', 'IMAP Server'), ('local', 'Local Server')], + 'Server Type'), + 'X_is_ssl': fields.boolean('SSL/TLS'), + 'X_user': fields.char('Username', size=256), + 'X_password': fields.char('Password', size=1024), } - server_ids = fetchmail_obj.search(cr, uid, [('name','=',type),('state','!=','done')]) - if not server_ids: - server_ids = [fetchmail_obj.create(cr, uid, server_vals, context=context)] - else: - server_ids = fetchmail_obj.search(cr, uid, [('name','=',type)], context=context) - fetchmail_obj.write(cr, uid, server_ids, server_vals, context=context) - fetchmail_obj.button_confirm_login(cr, uid, server_ids, context=None) + The method ``get_default_fetchmail_servers`` retrieves the current fetchmail configuration + for all fields that start with 'fetchmail_'. It looks up configurations that match the + given model name (``fetchmail_model``). The method ``set_fetchmail_servers`` updates the + fetchmail configurations by following the same conventions. Both methods are called + automatically by the methods of the model 'res.config.settings'. + + The onchange method ``onchange_fetchmail`` can be used to react on changes on the fields + 'X_type' and 'X_is_ssl'. Its first parameter is the fields' prefix (here 'X'). + """ + _name = 'fetchmail.config.settings' + + def get_default_fetchmail_servers(self, cr, uid, fields, context=None): + fetchmail_server = self.pool.get('fetchmail.server') + fetchmail_fields = [f for f in self._columns if f.startswith('fetchmail_')] + res = {} + for field in fetchmail_fields: + model_name = self._columns[field].fetchmail_model + model_id = ir_model.search(cr, uid, [('model', '=', model_name)])[0] + server_ids = fetchmail_server.search(cr, uid, [('object_id', '=', model_id), ('state', '=', 'done')]) + if server_ids: + server = fetchmail_server.browse(cr, uid, server_ids[0], context) + prefix = field[10:] + res.update({ + field: True, + prefix + '_server': server.server, + prefix + '_port': server.port, + prefix + '_type': server.type, + prefix + '_is_ssl': server.is_ssl, + prefix + '_user': server.user, + prefix + '_password': server.password, + }) + return res + + def set_fetchmail_servers(self, cr, uid, ids, context): + ir_model = self.pool.get('ir.model') + fetchmail_server = self.pool.get('fetchmail.server') + fetchmail_fields = [f for f in self._columns if f.startswith('fetchmail_')] + config = self.browse(cr, uid, ids[0], context) + for field in fetchmail_fields: + model_name = self._columns[field].fetchmail_model + model_id = ir_model.search(cr, uid, [('model', '=', model_name)])[0] + server_ids = fetchmail_server.search(cr, uid, [('object_id', '=', model_id), ('state', '=', 'done')]) + if config[field]: + prefix = field[10:] + values = { + 'server': config[prefix + '_server'], + 'port': config[prefix + '_port'], + 'type': config[prefix + '_type'], + 'is_ssl': config[prefix + '_is_ssl'], + 'user': config[prefix + '_user'], + 'password': config[prefix + '_password'], + } + if not server_ids: + values.update({ + 'name': getattr(self._columns[field], 'fetchmail_name', model_name), + 'object_id': model_id, + }) + server_ids = [fetchmail_server.create(cr, uid, values, context=context)] + else: + server_ids = fetchmail_server.search(cr, uid, [('object_id', '=', model_id)], context=context) + fetchmail_server.write(cr, uid, server_ids, values, context=context) + fetchmail_server.button_confirm_login(cr, uid, server_ids, context) else: - server_ids = fetchmail_obj.search(cr, uid, [('name','=',type),('state','=','done')]) - fetchmail_obj.set_draft(cr, uid, server_ids, context=None) + fetchmail_server.set_draft(cr, uid, server_ids, context) + + def onchange_fetchmail(self, cr, uid, ids, prefix, server_type, ssl, context=None): + values = {} + if server_type == 'pop': + values[prefix + '_port'] = ssl and 995 or 110 + elif server_type == 'imap': + values[prefix + '_port'] = ssl and 993 or 143 + else: + values[prefix + '_server'] = False + values[prefix + '_port'] = 0 + return {'value': values} # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: diff --git a/addons/project_issue/res_config.py b/addons/project_issue/res_config.py index caa775dae4e..3b921ca3a9c 100644 --- a/addons/project_issue/res_config.py +++ b/addons/project_issue/res_config.py @@ -21,10 +21,13 @@ from osv import osv, fields -class project_issue_mail_configuration(osv.osv_memory): - _inherit = 'project.config.settings' +class project_issue_settings(osv.osv_memory): + _name = 'project.config.settings' + _inherit = ['project.config.settings', 'fetchmail.config.settings'] + _columns = { - 'project_issue': fields.boolean("Create issues from an email account", + 'fetchmail_issue': fields.boolean("Create issues from an email account", + fetchmail_model='project.issue', fetchmail_name='Incoming issues', help="""Allows you to configure your incoming mail server, and create issues from incoming emails."""), 'issue_server' : fields.char('Server Name', size=256), 'issue_port' : fields.integer('Port'), @@ -36,17 +39,8 @@ class project_issue_mail_configuration(osv.osv_memory): 'issue_is_ssl': fields.boolean('SSL/TLS', help="Connections are encrypted with SSL/TLS through a dedicated port (default: IMAPS=993, POP=995)"), 'issue_user' : fields.char('Username', size=256), 'issue_password' : fields.char('Password', size=1024), - } + _defaults = { 'issue_type': 'pop', } - - def get_default_issue_server(self, cr, uid, ids, context=None): - context.update({'type':'issue'}) - res = self.get_default_email_configurations(cr, uid, ids, context) - return res - - def set_default_issue_server(self, cr, uid, ids, context=None): - context.update({'type':'issue','obj':'project.issue'}) - self.set_email_configurations(cr, uid, ids, context) diff --git a/addons/project_issue/res_config_view.xml b/addons/project_issue/res_config_view.xml index 1766db2dc71..5a0f0279f7a 100644 --- a/addons/project_issue/res_config_view.xml +++ b/addons/project_issue/res_config_view.xml @@ -9,14 +9,14 @@ - - - - - - - - + + + + + + + +