Xavier (Open ERP) has proposed merging
lp:~openerp-dev/openobject-addons/trunk-rename-url-action-xmo into
lp:openobject-addons.
Requested reviews:
OpenERP Core Team (openerp)
For more details, see:
https://code.launchpad.net/~openerp-dev/openobject-addons/trunk-rename-url-action-xmo/+merge/109339
Fixes document_ftp for
https://code.launchpad.net/~openerp-dev/openobject-server/trunk-rename-url-action-xmo/+merge/109337
Only literal usage of ir.actions.url in addons.
--
https://code.launchpad.net/~openerp-dev/openobject-addons/trunk-rename-url-action-xmo/+merge/109339
Your team OpenERP R&D Team is subscribed to branch
lp:~openerp-dev/openobject-addons/trunk-rename-url-action-xmo.
=== modified file 'document_ftp/wizard/ftp_browse.py'
--- document_ftp/wizard/ftp_browse.py 2012-01-31 13:36:57 +0000
+++ document_ftp/wizard/ftp_browse.py 2012-06-08 12:07:00 +0000
@@ -39,7 +39,7 @@
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]
=== modified file 'document_ftp/wizard/ftp_configuration.py'
--- document_ftp/wizard/ftp_configuration.py 2011-12-19 16:54:40 +0000
+++ document_ftp/wizard/ftp_configuration.py 2012-06-08 12:07:00 +0000
@@ -44,7 +44,7 @@
# 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()
=== modified file 'document_ftp/wizard/ftp_configuration_view.xml'
--- document_ftp/wizard/ftp_configuration_view.xml 2012-05-16 16:01:15 +0000
+++ document_ftp/wizard/ftp_configuration_view.xml 2012-06-08 12:07:00 +0000
@@ -1,6 +1,6 @@
<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>
_______________________________________________
Mailing list: https://launchpad.net/~openerp-dev-gtk
Post to : [email protected]
Unsubscribe : https://launchpad.net/~openerp-dev-gtk
More help : https://help.launchpad.net/ListHelp
