odoo
/
odoo
2
0
Fork 0
Code Pull Requests Releases Activity

[FIX] document_ftp: fix definition of config wizard 

bzr revid: rco@openerp.com-20120420130724-drt6bhl82v7jgmy7
This commit is contained in:
Raphael Collet 2012-04-20 15:07:24 +02:00
parent 36f97a0f3a
commit e5c1b99380
3 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
addons/document_ftp/__init__.py
View File

@ -18,9 +18,11 @@
# along with this program. If not, see <http://www.gnu.org/licenses/>. # along with this program. If not, see <http://www.gnu.org/licenses/>.
# #
############################################################################## ##############################################################################
import ftpserver import ftpserver
import wizard import wizard
import res_config import res_config
post_load = ftpserver.start_server post_load = ftpserver.start_server
# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:

13
addons/document_ftp/res_config.py
View File

@ -1,8 +1,8 @@
# -*- coding: utf-8 -*- # -*- coding: utf-8 -*-
############################################################################## ##############################################################################
# #
# OpenERP, Open Source Management Solution # OpenERP, Open Source Business Applications
# Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>). # Copyright (C) 2004-2012 OpenERP S.A. (<http://openerp.com>).
# #
# This program is free software: you can redistribute it and/or modify # This program is free software: you can redistribute it and/or modify
# it under the terms of the GNU Affero General Public License as # it under the terms of the GNU Affero General Public License as
@ -26,8 +26,8 @@ class documnet_ftp_setting(osv.osv_memory):
_name = 'knowledge.configuration' _name = 'knowledge.configuration'
_inherit = 'knowledge.configuration' _inherit = 'knowledge.configuration'
_columns = { _columns = {
'url': fields.char('Browse Documents',size=64, 'document_ftp_url': fields.char('Browse Documents',size=64,
help ="""It allow to browse the document from the relative URL""", readonly=True), help ="""It allow to browse the document from the relative URL""", readonly=True),
} }
def get_default_ftp_config(self, cr, uid, ids, context=None): def get_default_ftp_config(self, cr, uid, ids, context=None):
@ -45,5 +45,6 @@ class documnet_ftp_setting(osv.osv_memory):
url = url[:-1] url = url[:-1]
else: else:
url = '%s:%s' %(ftpserver.HOST, ftpserver.PORT) url = '%s:%s' %(ftpserver.HOST, ftpserver.PORT)
return {'url':'ftp://%s@%s'%(current_user.login, url)} return {'document_ftp_url':'ftp://%s@%s'%(current_user.login, url)}
# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:

11
addons/document_ftp/res_config_view.xml
View File

@ -1,17 +1,14 @@
<openerp> <openerp>
<data> <data>
<record id="view_document_ftp_configuration" model="ir.ui.view"> <record id="view_document_ftp_configuration" model="ir.ui.view">
<field name="name">Knowledge Application</field> <field name="name">Knowledge Application</field>
<field name="model">knowledge.configuration</field> <field name="model">knowledge.configuration</field>
<field name="type">form</field> <field name="type">form</field>
<field name="inherit_id" ref="document.view_knowledge_configuration"/> <field name="inherit_id" ref="base_setup.view_knowledge_configuration"/>
<field name="arch" type="xml"> <field name="arch" type="xml">
<xpath expr="//field[@name='module_document_ftp']" position="after"> <field name="module_document_ftp" position="after">
<group colspan="2" col="2"> <field name="document_ftp_url" widget="url"/>
<field name="url" widget="url" colspan="2"/> </field>
</group>
</xpath>
</field> </field>
</record> </record>
</data> </data>