diff options
| author | Christophe Matthieu <chm@openerp.com> | 2012-10-17 09:31:46 +0200 |
|---|---|---|
| committer | Christophe Matthieu <chm@openerp.com> | 2012-10-17 09:31:46 +0200 |
| commit | 23e20e95d41d5435cf3e5bfd136a6f52efa8a80f (patch) | |
| tree | 1969e768754adbcb6976a8b32c3eb5d35e778ac4 /addons/document | |
| parent | e8bd522f6be7fdeb1b7c916838193d7516833121 (diff) | |
| parent | 8a38ee944e02d6cd6cb18b87b962b67e510906a9 (diff) | |
[MERGE] from trunk
bzr revid: chm@openerp.com-20121017073146-9m5s2hffeekmj068
Diffstat (limited to 'addons/document')
| -rw-r--r-- | addons/document/document.py | 10 | ||||
| -rw-r--r-- | addons/document/document_view.xml | 12 |
2 files changed, 11 insertions, 11 deletions
diff --git a/addons/document/document.py b/addons/document/document.py index b94222fa11c..37a0219d143 100644 --- a/addons/document/document.py +++ b/addons/document/document.py @@ -36,8 +36,7 @@ DMS_ROOT_PATH = tools.config.get('document_path', os.path.join(tools.config['roo class document_file(osv.osv): _inherit = 'ir.attachment' - _rec_name = 'datas_fname' - + _rec_name = 'name' def _attach_parent_id(self, cr, uid, ids=None, context=None): """Migrate ir.attachments to the document module. @@ -149,6 +148,13 @@ class document_file(osv.osv): _sql_constraints = [ # filename_uniq is not possible in pure SQL ] + + def onchange_file(self, cr, uid, ids, datas_fname=False, context=None): + res = {'value':{}} + if datas_fname: + res['value'].update({'name': datas_fname}) + return res + def check(self, cr, uid, ids, mode, context=None, values=None): """Check access wrt. res_model, relax the rule of ir.attachment parent diff --git a/addons/document/document_view.xml b/addons/document/document_view.xml index b631583fb27..54776c4d36e 100644 --- a/addons/document/document_view.xml +++ b/addons/document/document_view.xml @@ -228,6 +228,9 @@ <field name="priority" eval="1"/> <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" on_change="onchange_file(datas_fname)"/> + </xpath> <field name="url" position="after"> <field name="user_id"/> </field> @@ -338,15 +341,6 @@ <field name="value" eval="'ir.actions.act_window,%d'%action_document_file_directory_form"/> </record> - <record model="ir.ui.view" id="view_attachment_form_inherit"> - <field name="name">ir.attachment.view.inherit</field> - <field name="model">ir.attachment</field> - <field name="inherit_id" ref="base.view_attachment_form"/> - <field name="arch" type="xml"> - <field name="datas_fname" position = "replace" > - </field> - </field> - </record> <record model="ir.ui.view" id="view_process_node_form_inherit1"> <field name="name">process.node.form</field> |