[IMP] file_email: fix default value, add company on email server, add sql constraint for uniqueness

This commit is contained in:
Sébastien Beau 2013-07-11 01:09:07 +02:00
parent 82f4c94193
commit 548e308a7a
5 changed files with 49 additions and 3 deletions

View File

@ -36,6 +36,7 @@
'init_xml': [],
'update_xml': [
"fetchmail_view.xml",
"file_document_view.xml",
],
'demo_xml': [],
'installable': True,

View File

@ -35,14 +35,23 @@ class fetchmail_server(orm.Model):
_columns = {
'file_type': fields.selection(_get_file_type, 'File Type',
help='The file type will show some special option'),
'company_id': fields.many2one('res.company', 'Company', required=True),#Why this field do not exist by default?
}
_defaults = {
'company_id': lambda s, cr, uid, c: s.pool.get('res.company')._company_default_get(cr, uid, 'fetchmail.server', context=c),
}
def get_context_for_server(self, cr, uid, server_id, context=None):
if context is None:
ctx = {}
else:
ctx = context.copy()
ctx['default_file_document_vals'] = {}
server = self.browse(cr, uid, server_id, context=context)
ctx['default_company_id'] = server.company_id.id
ctx['default_fetchmail_server_id'] = server_id
return ctx
def fetch_mail(self, cr, uid, ids, context=None):

View File

@ -8,6 +8,10 @@
<field name="type">form</field>
<field name="inherit_id" ref="fetchmail.view_email_server_form"/>
<field name="arch" type="xml">
<field name="date" position="after">
<field name="company_id" widget="selection" groups="base.group_multi_company"/>
</field>
<field name="object_id" position="after">
<field name="file_type"/> <!-- TODO attrs="{'invisible': [('object_id','!=', 'file.document')]}"/>-->
</field>

View File

@ -26,6 +26,15 @@ from openerp.osv import fields, orm
class file_document(orm.Model):
_inherit = "file.document"
_columns = {
'fetchmail_server_id': fields.many2one('fetchmail.server', 'Email Server'),
}
_sql_constraints = [
('fecthmail_server_ext_id_uniq', 'unique(fetchmail_server_id, ext_id)',
'The combination of Email Server and External id must be unique !'),
]
def _prepare_data_for_file_document(self, cr, uid, msg, context=None):
"""Method to prepare the data for creating a file document.
:param msg: a dictionnary with the email data
@ -41,9 +50,11 @@ class file_document(orm.Model):
res = self._prepare_data_for_file_document(cr, uid, msg, context=context)
if res:
for vals in res:
if context.get('default_file_document_vals'):
vals.update(context['default_file_document_vals'])
default = context.get('default_file_document_vals')
if default:
for key in default:
if not key in vals:
vals[key] = default[key]
created_ids.append(self.create(cr, uid, vals, context=context))
print "create message", vals['date']
return created_ids
return None

21
file_document_view.xml Normal file
View File

@ -0,0 +1,21 @@
<?xml version="1.0"?>
<openerp>
<data>
<!-- SEARCH -->
<record id="file_document_view_search" model="ir.ui.view">
<field name="name">file.document.search</field>
<field name="model">file.document</field>
<field name="type">search</field>
<field name="inherit_id" ref="file_document.file_document_view_search"/>
<field name="arch" type="xml">
<field name="ext_id" position="after">
<field name="fetchmail_server_id"/>
</field>
</field>
</record>
</data>
</openerp>