tryton-do/tryton
2
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Wiki Activity

Do not fail to get keyword action with empty record id

Browse Source 
Closes #12767
This commit is contained in:
Cédric Krier
2023-12-23 18:50:58 +01:00
parent 1cc73c08ab
commit dfadc5b62b
1 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
trytond/trytond/ir/action.py
+6 -5
View File
@@ -265,7 +265,7 @@ class ActionKeyword(ModelSQL, ModelView):
if keywords is not None:
return keywords
keywords = []
model, model_id = value
model, record_id = value
clause = [
('keyword', '=', keyword),
@@ -274,12 +274,12 @@ class ActionKeyword(ModelSQL, ModelView):
('model', '=', None),
],
]
if model_id >= 0:
if record_id is not None and record_id >= 0:
clause = ['OR',
clause,
[
('keyword', '=', keyword),
('model', '=', model + ',' + str(model_id)),
('model', '=', model + ',' + str(record_id)),
],
]
clause = [clause, ('action.active', '=', True)]
@@ -297,8 +297,9 @@ class ActionKeyword(ModelSQL, ModelView):
continue
value['keyword'] = keyword
keywords.append(value)
if keyword == 'tree_open' and model == Menu.__name__:
menu = Menu(model_id)
if (record_id is not None
and keyword == 'tree_open' and model == Menu.__name__):
menu = Menu(record_id)
for value in keywords:
if value['type'] == 'ir.action.act_window':
if len(keywords) == 1: