pengyuthon/odoo_source
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[IMP] knowledge: improve the code in res_config.py for document_ftp module

Browse Source 
bzr revid: jap@tinyerp.com-20120403125112-vt9etd6kl0vdzzld
This commit is contained in:
Jagdish Panchal (Open ERP)
2012-04-03 18:21:12 +05:30
parent de464e0209
commit 55be062216
4 changed files with 34 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files
addons/document/res_config.py
-6
View File
@@ -18,10 +18,7 @@
# along with this program. If not, see <http://www.gnu.org/licenses/>.
#
##############################################################################
from osv import fields, osv
from tools import config
from lxml import etree
class knowledge_configuration(osv.osv_memory):
_name = 'knowledge.configuration'
@@ -36,10 +33,7 @@ class knowledge_configuration(osv.osv_memory):
help ="""It install the document_ftp."""),
'module_document_webdav': fields.boolean('Share Repositories (WebDAV)',
help ="""It install the document_webdav."""),
}
knowledge_configuration()
# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
addons/document/res_config_view.xml
+1 -1
View File
@@ -15,8 +15,8 @@
</group>
<separator string="Documents" colspan="4"/>
<group colspan="4" col="4">
<field name="module_document_ftp"/>
<field name="module_document_webdav"/>
<field name="module_document_ftp"/>
</group>
</form>
</field>
addons/document_ftp/res_config.py
+29 -9
View File
@@ -21,19 +21,39 @@
from osv import fields, osv
from tools import config
from lxml import etree
class documnet_ftp_configuration(osv.osv_memory):
class documnet_ftp_setting(osv.osv_memory):
_name = 'knowledge.configuration'
_inherit = 'knowledge.configuration'
_columns = {
'server_address_port': fields.char('Server address/IP and port',size=128,
help ="""It assign server address/IP and port."""),
'url': fields.char('Borwse Documents',size=64,
help ="""It allow to browse the document from the relative URL""", readonly=True),
}
_defaults = {
'server_address_port': config.get('ftp_server_host', 'localhost') + ':' + config.get('ftp_server_port', '8021'),
}
def get_default_ftp_config(self, cr, uid, ids, context=None):
ir_values = self.pool.get('ir.actions.url')
user_pool = self.pool.get('res.users')
current_user = user_pool.browse(cr, uid, uid, context=context)
data_pool = self.pool.get('ir.model.data')
aid = data_pool._get_id(cr, uid, 'document_ftp', 'action_document_browse')
aid = data_pool.browse(cr, uid, aid, context=context).res_id
ftp_url = self.pool.get('ir.actions.url').browse(cr, uid, aid, context=context)
url = ftp_url.url and ftp_url.url.split('ftp://') or []
if url:
url = url[1]
if url[-1] == '/':
url = url[:-1]
else:
url = '%s:%s' %(ftpserver.HOST, ftpserver.PORT)
return {'url':'ftp://%s@%s'%(current_user.login, url)}
def document_ftp(self, cr, uid, ids, context=None):
data_id = ids and ids[0] or False
data = self.browse(cr, uid, data_id, context=context)
return {
'type': 'ir.actions.act_url',
'url':data.url,
'nodestroy':True,
}
# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
addons/document_ftp/res_config_view.xml
+4 -1
View File
@@ -8,7 +8,10 @@
<field name="inherit_id" ref="document.view_knowledge_configuration"/>
<field name="arch" type="xml">
<xpath expr="//field[@name='module_document_ftp']" position="after">
<field name="server_address_port"/>
<group colspan="4" col="4">
<field name="url" widget="url" colspan="2"/>
<button name="document_ftp" string="Browse" type="object" icon="gtk-ok"/>
</group>
</xpath>
</field>
</record>