Browse Source

[MRG] [MIGR] Mark the mail_environnement module as installable = True

pull/2/head
unknown 11 years ago
committed by Yannick Vaucher
parent
commit
fdb3952ff3
  1. 2
      mail_environment/__openerp__.py
  2. 24
      mail_environment/env_mail.py

2
mail_environment/__openerp__.py

@ -61,7 +61,7 @@ password = openerp
'init_xml': [], 'init_xml': [],
'update_xml': ['mail_view.xml'], 'update_xml': ['mail_view.xml'],
'demo_xml': [], 'demo_xml': [],
'installable': False,
'installable': True,
'active': False, 'active': False,
} }
# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:

24
mail_environment/env_mail.py

@ -128,6 +128,29 @@ class FetchmailServer(osv.osv):
res[fetchmail.id] = config_vals res[fetchmail.id] = config_vals
return res return res
def _type_search(self, cr, uid, obj, name, args, context={}):
result_ids = []
# read all incomming servers values
all_ids = self.search(cr, uid, [], context=context)
results = self.read(cr, uid, all_ids, ['id','type'], context=context)
args = args[:]
i = 0
while i < len(args):
operator = args[i][1]
if operator == '=':
for res in results:
if (res['type'] == args[i][2]) and (res['id'] not in result_ids):
result_ids.append(res['id'])
elif operator == 'in':
for search_vals in args[i][2]:
for res in results:
if (res['type'] == search_vals) and (res['id'] not in result_ids):
result_ids.append(res['id'])
else:
continue
i += 1
return [('id', 'in', result_ids)]
_columns = { _columns = {
'server': fields.function(_get_incom_conf, 'server': fields.function(_get_incom_conf,
method=True, method=True,
@ -146,6 +169,7 @@ class FetchmailServer(osv.osv):
string='Type', string='Type',
type="char", type="char",
multi='income_mail_config', multi='income_mail_config',
fnct_search=_type_search,
size=64, size=64,
help="pop, imap, local"), help="pop, imap, local"),
'is_ssl': fields.function(_get_incom_conf, 'is_ssl': fields.function(_get_incom_conf,

Loading…
Cancel
Save