Skip to content

Commit c670dae

Browse files
emjay0921emjay0921
committed
[FIX] area import queue jobs field
1 parent 648b446 commit c670dae

File tree

5 files changed

+82
-64
lines changed

5 files changed

+82
-64
lines changed

‎spp_area_base/models/area_import.py‎

Lines changed: 0 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -80,26 +80,6 @@ class OpenSPPAreaImport(models.Model):
8080
locked = fields.Boolean(default=False)
8181
locked_reason = fields.Char(readonly=True)
8282

83-
job_ids = fields.One2many(
84-
"queue.job",
85-
compute="_compute_job_ids",
86-
string="Related Jobs",
87-
help="Queue jobs related to this area import",
88-
)
89-
90-
def _compute_job_ids(self):
91-
"""
92-
Compute related queue jobs based on res_id and res_model fields.
93-
"""
94-
for rec in self:
95-
jobs = self.env["queue.job"].search(
96-
[
97-
("res_model", "=", "spp.area.import"),
98-
("res_id", "=", rec.id),
99-
]
100-
)
101-
rec.job_ids = jobs
102-
10383
@api.onchange("excel_file")
10484
def excel_file_change(self):
10585
"""

‎spp_area_base/views/area_import_views.xml‎

Lines changed: 0 additions & 44 deletions
Original file line numberDiff line numberDiff line change
@@ -185,50 +185,6 @@
185185
</tree>
186186
</field>
187187
</page>
188-
<page string="Queue Jobs" name="queue_jobs" invisible="not job_ids">
189-
<field name="job_ids" nolabel="1" readonly="1">
190-
<tree>
191-
<field name="name" />
192-
<field
193-
name="state"
194-
decoration-info="state=='pending'"
195-
decoration-warning="state=='enqueued'"
196-
decoration-primary="state=='started'"
197-
decoration-success="state=='done'"
198-
decoration-danger="state=='failed'"
199-
widget="badge"
200-
/>
201-
<field name="date_created" />
202-
<field name="date_started" />
203-
<field name="date_done" />
204-
<field name="exc_info" />
205-
</tree>
206-
<form>
207-
<header>
208-
<field name="state" widget="statusbar" />
209-
</header>
210-
<group>
211-
<group>
212-
<field name="name" />
213-
<field name="model_name" />
214-
<field name="method_name" />
215-
<field name="res_model" />
216-
<field name="res_id" />
217-
</group>
218-
<group>
219-
<field name="date_created" />
220-
<field name="date_enqueued" />
221-
<field name="date_started" />
222-
<field name="date_done" />
223-
<field name="priority" />
224-
</group>
225-
</group>
226-
<group string="Exception Information" invisible="not exc_info">
227-
<field name="exc_info" nolabel="1" readonly="1" />
228-
</group>
229-
</form>
230-
</field>
231-
</page>
232188
</notebook>
233189
</sheet>
234190
</form>

‎spp_base_common/models/__init__.py‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,3 +4,4 @@
44
from . import phone_number
55
from . import queue_job
66
from . import res_partner
7+
from . import area_import

‎spp_base_common/models/area_import.py‎

Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,25 @@
1+
from odoo import fields, models
2+
3+
4+
class OpenSPPAreaImport(models.Model):
5+
_inherit = "spp.area.import"
6+
7+
job_ids = fields.One2many(
8+
"queue.job",
9+
compute="_compute_job_ids",
10+
string="Related Jobs",
11+
help="Queue jobs related to this area import",
12+
)
13+
14+
def _compute_job_ids(self):
15+
"""
16+
Compute related queue jobs based on res_id and res_model fields.
17+
"""
18+
for rec in self:
19+
jobs = self.env["queue.job"].search(
20+
[
21+
("res_model", "=", "spp.area.import"),
22+
("res_id", "=", rec.id),
23+
]
24+
)
25+
rec.job_ids = jobs

‎spp_base_common/views/area_import_view.xml‎

Lines changed: 56 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,56 @@
1+
<?xml version="1.0" encoding="utf-8" ?>
2+
<odoo>
3+
<record id="view_spparea_import_form_inherit" model="ir.ui.view">
4+
<field name="name">view_spparea_import_form_inherit</field>
5+
<field name="model">spp.area.import</field>
6+
<field name="inherit_id" ref="spp_area_base.view_spparea_import_form" />
7+
<field name="arch" type="xml">
8+
<xpath expr="//page[@name='json_data']" position="after">
9+
<page string="Queue Jobs" name="queue_jobs" invisible="not job_ids">
10+
<field name="job_ids" nolabel="1" readonly="1">
11+
<tree>
12+
<field name="name" />
13+
<field
14+
name="state"
15+
decoration-info="state=='pending'"
16+
decoration-warning="state=='enqueued'"
17+
decoration-primary="state=='started'"
18+
decoration-success="state=='done'"
19+
decoration-danger="state=='failed'"
20+
widget="badge"
21+
/>
22+
<field name="date_created" />
23+
<field name="date_started" />
24+
<field name="date_done" />
25+
<field name="exc_info" />
26+
</tree>
27+
<form>
28+
<header>
29+
<field name="state" widget="statusbar" />
30+
</header>
31+
<group>
32+
<group>
33+
<field name="name" />
34+
<field name="model_name" />
35+
<field name="method_name" />
36+
<field name="res_model" />
37+
<field name="res_id" />
38+
</group>
39+
<group>
40+
<field name="date_created" />
41+
<field name="date_enqueued" />
42+
<field name="date_started" />
43+
<field name="date_done" />
44+
<field name="priority" />
45+
</group>
46+
</group>
47+
<group string="Exception Information" invisible="not exc_info">
48+
<field name="exc_info" nolabel="1" readonly="1" />
49+
</group>
50+
</form>
51+
</field>
52+
</page>
53+
</xpath>
54+
</field>
55+
</record>
56+
</odoo>

0 commit comments

Comments
 (0)