summaryrefslogtreecommitdiff
path: root/addons/document
diff options
context:
space:
mode:
authordle@openerp.com <>2012-12-24 14:53:32 +0100
committerdle@openerp.com <>2012-12-24 14:53:32 +0100
commit71e1261e3a0abddedaa5a9a67bba5ea832a47504 (patch)
treea76d3ef7c026861d42912a5c99ead9004954ff24 /addons/document
parent3da0c3a878e4e0f2877e6f0569bb9346d6cfbb0f (diff)
[DEL]Revert changes. Wrong target : Was for 7.0 instead of trunk
bzr revid: dle@openerp.com-20121224135332-a6irq9gimyaedqx4
Diffstat (limited to 'addons/document')
-rw-r--r--addons/document/document.py14
-rw-r--r--addons/document/document_view.xml2
2 files changed, 1 insertions, 15 deletions
diff --git a/addons/document/document.py b/addons/document/document.py
index 1671b6bc1ba..6cb2cabbf38 100644
--- a/addons/document/document.py
+++ b/addons/document/document.py
@@ -117,22 +117,8 @@ class document_file(osv.osv):
# take partner from uid
if vals.get('res_id', False) and vals.get('res_model', False) and not vals.get('partner_id', False):
vals['partner_id'] = self.__get_partner_id(cr, uid, vals['res_model'], vals['res_id'], context)
- if vals.get('datas', False):
- vals['file_type'], vals['index_content'] = self._index(cr, uid, vals['datas'].decode('base64'), vals.get('datas_fname', False), None)
return super(document_file, self).create(cr, uid, vals, context)
- def write(self, cr, uid, ids, vals, context=None):
- if context is None:
- context = {}
- if vals.get('datas', False):
- vals['file_type'], vals['index_content'] = self._index(cr, uid, vals['datas'].decode('base64'), vals.get('datas_fname', False), None)
- return super(document_file, self).write(cr, uid, ids, vals, context)
-
- def _index(self, cr, uid, data, datas_fname, file_type):
- mime, icont = cntIndex.doIndex(data, datas_fname, file_type or None, None)
- icont_u = ustr(icont)
- return mime, icont_u
-
def __get_partner_id(self, cr, uid, res_model, res_id, context=None):
""" A helper to retrieve the associated partner from any res_model+id
It is a hack that will try to discover if the mentioned record is
diff --git a/addons/document/document_view.xml b/addons/document/document_view.xml
index 68f294b251c..4c2456de827 100644
--- a/addons/document/document_view.xml
+++ b/addons/document/document_view.xml
@@ -167,7 +167,7 @@
<field name="inherit_id" ref="base.view_attachment_form"/>
<field name="arch" type="xml">
<xpath expr="//field[@name='datas_fname']" position="replace">
- <field name="datas_fname" invisible="1"/>
+ <field name="datas_fname" invisible="1" on_change="onchange_file(datas_fname)"/>
</xpath>
<field name="url" position="after">
<field name="user_id"/>