Xavier (Open ERP) has proposed merging
lp:~openerp-dev/openobject-server/trunk-rename-url-action-xmo into
lp:openobject-server.
Requested reviews:
OpenERP Core Team (openerp)
For more details, see:
https://code.launchpad.net/~openerp-dev/openobject-server/trunk-rename-url-action-xmo/+merge/109337
Rename ir.actions.url (model) to ir.actions.act_url: all other action types use
model name for type, and there are pieces of code assuming this (and no other
way to reverse the model from the ir.actions.actions either way).
See also: related branches for adddons (cleanup of document_ftp) and web client
(special cases ir.actions.url)
--
https://code.launchpad.net/~openerp-dev/openobject-server/trunk-rename-url-action-xmo/+merge/109337
Your team OpenERP R&D Team is subscribed to branch
lp:~openerp-dev/openobject-server/trunk-rename-url-action-xmo.
=== modified file 'openerp/addons/base/ir/ir_actions.py'
--- openerp/addons/base/ir/ir_actions.py 2012-05-10 09:35:27 +0000
+++ openerp/addons/base/ir/ir_actions.py 2012-06-08 12:03:20 +0000
@@ -375,7 +375,7 @@
act_wizard()
class act_url(osv.osv):
- _name = 'ir.actions.url'
+ _name = 'ir.actions.act_url'
_table = 'ir_act_url'
_sequence = 'ir_actions_id_seq'
_order = 'name'
=== modified file 'openerp/addons/base/ir/ir_ui_menu.py'
--- openerp/addons/base/ir/ir_ui_menu.py 2012-04-18 11:50:50 +0000
+++ openerp/addons/base/ir/ir_ui_menu.py 2012-06-08 12:03:20 +0000
@@ -293,7 +293,7 @@
('ir.actions.report.xml', 'ir.actions.report.xml'),
('ir.actions.act_window', 'ir.actions.act_window'),
('ir.actions.wizard', 'ir.actions.wizard'),
- ('ir.actions.url', 'ir.actions.url'),
+ ('ir.actions.act_url', 'ir.actions.act_url'),
('ir.actions.server', 'ir.actions.server'),
('ir.actions.client', 'ir.actions.client'),
]),
=== modified file 'openerp/addons/base/security/ir.model.access.csv'
--- openerp/addons/base/security/ir.model.access.csv 2012-04-18 08:59:45 +0000
+++ openerp/addons/base/security/ir.model.access.csv 2012-06-08 12:03:20 +0000
@@ -98,8 +98,8 @@
"access_workflow_workitem_all","workflow_workitem_all","model_workflow_workitem",,1,1,1,1
"access_ir_actions_act_window_view_all","ir_actions_act_window_view_all","model_ir_actions_act_window_view",,1,0,0,0
"access_ir_actions_act_window_view_group_system","ir_actions_act_window_view_group_system","model_ir_actions_act_window_view","group_system",1,1,1,1
-"access_ir_actions_url_all","ir_actions_url_all","model_ir_actions_url",,1,0,0,0
-"access_ir_actions_url_group_system","ir_actions_url_group_system","model_ir_actions_url","group_system",1,1,1,1
+"access_ir_actions_act_url_all","ir_actions_act_url_all","model_ir_actions_act_url",,1,0,0,0
+"access_ir_actions_act_url_group_system","ir_actions_act_url_group_system","model_ir_actions_act_url","group_system",1,1,1,1
"access_ir_server_object_lines_all","ir_server_object_lines_all","model_ir_server_object_lines",,1,0,0,0
"access_ir_server_object_lines_group_system","ir_server_object_lines_group_system","model_ir_server_object_lines","group_system",1,1,1,1
"access_ir_actions_server_all","ir_actions_server_all","model_ir_actions_server",,1,0,0,0
=== modified file 'openerp/tools/convert.py'
--- openerp/tools/convert.py 2012-03-02 11:28:34 +0000
+++ openerp/tools/convert.py 2012-06-08 12:03:20 +0000
@@ -384,18 +384,8 @@
res = {'name': name, 'url': url, 'target':target}
- id = self.pool.get('ir.model.data')._update(cr, self.uid, "ir.actions.url", self.module, res, xml_id, noupdate=self.isnoupdate(data_node), mode=self.mode)
+ id = self.pool.get('ir.model.data')._update(cr, self.uid, "ir.actions.act_url", self.module, res, xml_id, noupdate=self.isnoupdate(data_node), mode=self.mode)
self.idref[xml_id] = int(id)
- # ir_set
- if (not rec.get('menu') or eval(rec.get('menu','False'))) and id:
- keyword = str(rec.get('keyword','') or 'client_action_multi')
- value = 'ir.actions.url,'+str(id)
- replace = rec.get("replace",'') or True
- self.pool.get('ir.model.data').ir_set(cr, self.uid, 'action', keyword, url, ["ir.actions.url"], value, replace=replace, isobject=True, xml_id=xml_id)
- elif self.mode=='update' and (rec.get('menu') and eval(rec.get('menu','False'))==False):
- # Special check for URL having attribute menu=False on update
- value = 'ir.actions.url,'+str(id)
- self._remove_ir_values(cr, url, value, "ir.actions.url")
def _tag_act_window(self, cr, rec, data_node=None):
name = rec.get('name','').encode('utf-8')
=== modified file 'openerp/tools/yaml_import.py'
--- openerp/tools/yaml_import.py 2012-05-21 13:55:56 +0000
+++ openerp/tools/yaml_import.py 2012-06-08 12:03:20 +0000
@@ -728,15 +728,15 @@
res = {'name': node.name, 'url': node.url, 'target': node.target}
id = self.pool.get('ir.model.data')._update(self.cr, 1, \
- "ir.actions.url", self.module, res, node.id, mode=self.mode)
+ "ir.actions.act_url", self.module, res, node.id, mode=self.mode)
self.id_map[node.id] = int(id)
# ir_set
if (not node.menu or eval(node.menu)) and id:
keyword = node.keyword or 'client_action_multi'
- value = 'ir.actions.url,%s' % id
+ value = 'ir.actions.act_url,%s' % id
replace = node.replace or True
self.pool.get('ir.model.data').ir_set(self.cr, 1, 'action', \
- keyword, node.url, ["ir.actions.url"], value, replace=replace, \
+ keyword, node.url, ["ir.actions.act_url"], value, replace=replace, \
noupdate=self.isnoupdate(node), isobject=True, xml_id=node.id)
def process_ir_set(self, node):
_______________________________________________
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
