Use cr argument instead of cursor, propagate context
parent
24a2d12492
commit
5c137c1a00
|
@ -1 +1,2 @@
|
||||||
|
# -*- coding: utf-8 -*-
|
||||||
from . import env_mail
|
from . import env_mail
|
||||||
|
|
|
@ -27,12 +27,12 @@ from openerp.addons.server_environment import serv_config
|
||||||
class IrMail(orm.Model):
|
class IrMail(orm.Model):
|
||||||
_inherit = "ir.mail_server"
|
_inherit = "ir.mail_server"
|
||||||
|
|
||||||
def _get_smtp_conf(self, cursor, uid, ids, name, args, context=None):
|
def _get_smtp_conf(self, cr, uid, ids, name, args, context=None):
|
||||||
"""
|
"""
|
||||||
Return configuration
|
Return configuration
|
||||||
"""
|
"""
|
||||||
res = {}
|
res = {}
|
||||||
for mail_server in self.browse(cursor, uid, ids):
|
for mail_server in self.browse(cr, uid, ids, context=context):
|
||||||
global_section_name = 'outgoing_mail'
|
global_section_name = 'outgoing_mail'
|
||||||
|
|
||||||
# default vals
|
# default vals
|
||||||
|
@ -99,12 +99,12 @@ class FetchmailServer(orm.Model):
|
||||||
"""Incoming POP/IMAP mail server account"""
|
"""Incoming POP/IMAP mail server account"""
|
||||||
_inherit = 'fetchmail.server'
|
_inherit = 'fetchmail.server'
|
||||||
|
|
||||||
def _get_incom_conf(self, cursor, uid, ids, name, args, context=None):
|
def _get_incom_conf(self, cr, uid, ids, name, args, context=None):
|
||||||
"""
|
"""
|
||||||
Return configuration
|
Return configuration
|
||||||
"""
|
"""
|
||||||
res = {}
|
res = {}
|
||||||
for fetchmail in self.browse(cursor, uid, ids):
|
for fetchmail in self.browse(cr, uid, ids, context=context):
|
||||||
global_section_name = 'incoming_mail'
|
global_section_name = 'incoming_mail'
|
||||||
|
|
||||||
key_types = {'port': int,
|
key_types = {'port': int,
|
||||||
|
@ -132,7 +132,7 @@ class FetchmailServer(orm.Model):
|
||||||
res[fetchmail.id] = config_vals
|
res[fetchmail.id] = config_vals
|
||||||
return res
|
return res
|
||||||
|
|
||||||
def _type_search(self, cr, uid, obj, name, args, context={}):
|
def _type_search(self, cr, uid, obj, name, args, context=None):
|
||||||
result_ids = []
|
result_ids = []
|
||||||
# read all incomming servers values
|
# read all incomming servers values
|
||||||
all_ids = self.search(cr, uid, [], context=context)
|
all_ids = self.search(cr, uid, [], context=context)
|
||||||
|
|
Loading…
Reference in New Issue