diff options
| author | Fabien Meghazi <fme@openerp.com> | 2012-10-02 09:49:31 +0200 |
|---|---|---|
| committer | Fabien Meghazi <fme@openerp.com> | 2012-10-02 09:49:31 +0200 |
| commit | 4d2299adc4e9d7db2cb52a79cf4ab8ebaad707ae (patch) | |
| tree | 8a45a95b39d3b060fdef188f3da8a70fbfe20ad5 /addons/document_ftp | |
| parent | 32d492acf9db0a57487a1c6c47e4311d842e99f7 (diff) | |
| parent | a5fac44994a5d2c0e20cdde0bf72ef152d2342dd (diff) | |
[MERGE] trunk
bzr revid: fme@openerp.com-20121002074931-845aiqhflw2rqrcn
Diffstat (limited to 'addons/document_ftp')
| -rw-r--r-- | addons/document_ftp/wizard/ftp_browse.py | 2 | ||||
| -rw-r--r-- | addons/document_ftp/wizard/ftp_configuration.py | 2 | ||||
| -rw-r--r-- | addons/document_ftp/wizard/ftp_configuration_view.xml | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/addons/document_ftp/wizard/ftp_browse.py b/addons/document_ftp/wizard/ftp_browse.py index b1120bc6511..8260424d653 100644 --- a/addons/document_ftp/wizard/ftp_browse.py +++ b/addons/document_ftp/wizard/ftp_browse.py @@ -39,7 +39,7 @@ class document_ftp_browse(osv.osv_memory): 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) + ftp_url = self.pool.get('ir.actions.act_url').browse(cr, uid, aid, context=context) url = ftp_url.url and ftp_url.url.split('ftp://') or [] if url: url = url[1] diff --git a/addons/document_ftp/wizard/ftp_configuration.py b/addons/document_ftp/wizard/ftp_configuration.py index 5da2ddf11e8..d0679973c5a 100644 --- a/addons/document_ftp/wizard/ftp_configuration.py +++ b/addons/document_ftp/wizard/ftp_configuration.py @@ -44,7 +44,7 @@ class document_ftp_configuration(osv.osv_memory): # Update the action for FTP browse. aid = data_pool._get_id(cr, uid, 'document_ftp', 'action_document_browse') aid = data_pool.browse(cr, uid, aid, context=context).res_id - self.pool.get('ir.actions.url').write(cr, uid, [aid], + self.pool.get('ir.actions.act_url').write(cr, uid, [aid], {'url': 'ftp://'+(conf.host or 'localhost:8021')+'/' + cr.dbname+'/'}) document_ftp_configuration() diff --git a/addons/document_ftp/wizard/ftp_configuration_view.xml b/addons/document_ftp/wizard/ftp_configuration_view.xml index 36fb80c51af..9e05fba986e 100644 --- a/addons/document_ftp/wizard/ftp_configuration_view.xml +++ b/addons/document_ftp/wizard/ftp_configuration_view.xml @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="utf-8"?> <openerp> <data> - <record model="ir.actions.url" id="action_document_browse"> + <record model="ir.actions.act_url" id="action_document_browse"> <field name="name">Browse Files</field> <field name="url">ftp://localhost:8021/</field> </record> |