Skip to content

Commit d5e3162

Browse files
[MIG] base_ir_actions_sequence: Migration to 18.0
1 parent de83726 commit d5e3162

File tree

3 files changed

+20
-22
lines changed

3 files changed

+20
-22
lines changed

base_ir_actions_sequence/__manifest__.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
# License LGPL-3.0 or later (http://www.gnu.org/licenses/lgpl).
33
{
44
"name": "Base Actions Sequence",
5-
"version": "13.0.1.0.1",
5+
"version": "18.0.1.0.0",
66
"category": "Extra Tools",
77
"author": "ForgeFlow, Odoo Community Association (OCA)",
88
"website": "https://github.com/OCA/server-ux",
Lines changed: 13 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,19 @@
1-
from collections import defaultdict
2-
3-
from odoo import api, fields, models, tools
1+
from odoo import fields, models, tools
2+
from odoo.tools import frozendict
43

54

65
class IrActions(models.Model):
76
_inherit = "ir.actions.actions"
87

9-
priority = fields.Integer(string="Sequence", default=16, required=True)
8+
sequence = fields.Integer(default=16, required=True)
109

11-
@api.model
12-
@tools.ormcache("frozenset(self.env.user.groups_id.ids)", "model_name")
13-
def get_bindings(self, model_name):
14-
"""
15-
Order Report Actions by priority
16-
"""
17-
res = super().get_bindings(model_name)
18-
ordered_res = defaultdict(list)
19-
for key, values in res.items():
20-
ordered_res[key] = sorted(values, key=lambda x: (x["priority"], x["id"]))
21-
return ordered_res
10+
@tools.ormcache("model_name", "self.env.lang")
11+
def _get_bindings(self, model_name):
12+
result = dict(super()._get_bindings(model_name))
13+
# Only for 'report' type, since for 'action' type the bindings are
14+
# managed in the original _get_bindings method
15+
if result.get("report"):
16+
result["report"] = tuple(
17+
sorted(result["report"], key=lambda vals: vals.get("sequence", 0))
18+
)
19+
return frozendict(result)

base_ir_actions_sequence/views/actions_views.xml

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
<field name="inherit_id" ref="base.view_server_action_form" />
1010
<field name="arch" type="xml">
1111
<field name="model_id" position="after">
12-
<field name="priority" />
12+
<field name="sequence" />
1313
</field>
1414
</field>
1515
</record>
@@ -19,7 +19,7 @@
1919
<field name="inherit_id" ref="base.view_server_action_tree" />
2020
<field name="arch" type="xml">
2121
<field name="usage" position="after">
22-
<field name="priority" optional="show" />
22+
<field name="sequence" optional="show" />
2323
</field>
2424
</field>
2525
</record>
@@ -32,7 +32,7 @@
3232
<field name="inherit_id" ref="base.view_window_action_form" />
3333
<field name="arch" type="xml">
3434
<field name="res_model" position="after">
35-
<field name="priority" />
35+
<field name="sequence" />
3636
</field>
3737
</field>
3838
</record>
@@ -44,7 +44,7 @@
4444
<field name="inherit_id" ref="base.view_window_action_tree" />
4545
<field name="arch" type="xml">
4646
<field name="context" position="after">
47-
<field name="priority" optional="show" />
47+
<field name="sequence" optional="show" />
4848
</field>
4949
</field>
5050
</record>
@@ -55,7 +55,7 @@
5555
<field name="inherit_id" ref="base.act_report_xml_view" />
5656
<field name="arch" type="xml">
5757
<field name="report_type" position="after">
58-
<field name="priority" />
58+
<field name="sequence" />
5959
</field>
6060
</field>
6161
</record>
@@ -67,7 +67,7 @@
6767
<field name="inherit_id" ref="base.act_report_xml_view_tree" />
6868
<field name="arch" type="xml">
6969
<field name="report_type" position="after">
70-
<field name="priority" optional="show" />
70+
<field name="sequence" optional="show" />
7171
</field>
7272
</field>
7373
</record>

0 commit comments

Comments
 (0)