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

[IMP] let non-act_window actions pass through unmolested by clean_action, which is currently mostly there to cleanup the junk in act_window actions 

bzr revid: xmo@openerp.com-20110629151400-pyv48na2wecp7rhj
This commit is contained in:
Xavier Morel 2011-06-29 17:14:00 +02:00
parent 70cd94aeae
commit ef3a71fec3
1 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
addons/base/controllers/main.py
View File

@ -243,12 +243,12 @@ def load_actions_from_ir_values(req, key, key2, models, meta, context):
Values = req.session.model('ir.values') Values = req.session.model('ir.values')
actions = Values.get(key, key2, models, meta, context) actions = Values.get(key, key2, models, meta, context)
for _, _, action in actions: return [(id, name, clean_action(action, req.session))
clean_action(action, req.session) for id, name, action in actions]
return actions
def clean_action(action, session): def clean_action(action, session):
if action['type'] != 'ir.actions.act_window':
return action
# values come from the server, we can just eval them # values come from the server, we can just eval them
if isinstance(action.get('context', None), basestring): if isinstance(action.get('context', None), basestring):
action['context'] = eval( action['context'] = eval(
@ -260,7 +260,7 @@ def clean_action(action, session):
action['domain'], action['domain'],
session.evaluation_context( session.evaluation_context(
action['context'])) or [] action['context'])) or []
if not action.has_key('flags'): if 'flags' not in action:
# Set empty flags dictionary for web client. # Set empty flags dictionary for web client.
action['flags'] = dict() action['flags'] = dict()
return fix_view_modes(action) return fix_view_modes(action)
@ -286,11 +286,11 @@ def fix_view_modes(action):
if action.pop('view_type') != 'form': if action.pop('view_type') != 'form':
return return
if action.has_key('view_mode'): if 'view_mode' in action:
action['view_mode'] = ','.join( action['view_mode'] = ','.join(
mode if mode != 'tree' else 'list' mode if mode != 'tree' else 'list'
for mode in action['view_mode'].split(',')) for mode in action['view_mode'].split(','))
if action.has_key('views'): if 'views' in action:
action['views'] = [ action['views'] = [
[id, mode if mode != 'tree' else 'list'] [id, mode if mode != 'tree' else 'list']
for id, mode in action['views'] for id, mode in action['views']
@ -461,8 +461,8 @@ class DataSet(openerpweb.Controller):
def call_button(self, req, model, method, args, domain_id=None, context_id=None): def call_button(self, req, model, method, args, domain_id=None, context_id=None):
action = self.call_common(req, model, method, args, domain_id, context_id) action = self.call_common(req, model, method, args, domain_id, context_id)
if isinstance(action, dict) and action.get('type') != '': if isinstance(action, dict) and action.get('type') != '':
clean_action(action, req.session) return {'result': clean_action(action, req.session)}
return {'result': action} return {'result': False}
@openerpweb.jsonrequest @openerpweb.jsonrequest
def exec_workflow(self, req, model, id, signal): def exec_workflow(self, req, model, id, signal):