Skip to content

Commit 21c4062

Browse files
committed
[FIX] queue_job_batch: migrate messaging system
1 parent 63933a5 commit 21c4062

4 files changed

Lines changed: 14 additions & 22 deletions

File tree

queue_job_batch/controllers/webclient.py

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -7,15 +7,16 @@
77

88

99
class WebClient(WebclientController):
10-
def _process_request_for_internal_user(self, store, **kwargs):
11-
res = super()._process_request_for_internal_user(store, **kwargs)
12-
if kwargs.get("systray_get_queue_job_batches"):
10+
@classmethod
11+
def _process_request_for_internal_user(self, store, name, params):
12+
res = super()._process_request_for_internal_user(store, name, params)
13+
if name == "systray_get_queue_job_batches":
1314
# sudo: bus.bus: reading non-sensitive last id
1415
bus_last_id = request.env["bus.bus"].sudo()._bus_last_id()
1516
batches = request.env.user._get_queue_job_batches()
1617
store.add(batches)
17-
store.add(
18-
{
18+
store.add_global_values(
19+
**{
1920
"queueJobBatchCounter": len(batches),
2021
"queueJobBatchCounterBusId": bus_last_id,
2122
}

queue_job_batch/models/queue_job_batch.py

Lines changed: 5 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -109,20 +109,16 @@ def _compute_job_count(self):
109109
rec.completeness = rec.finished_job_count / max(1, rec.job_count)
110110
rec.failed_percentage = rec.failed_job_count / max(1, rec.job_count)
111111

112-
@api.model
113-
def _to_store_fnames(self):
114-
return (
112+
def _to_store_defaults(self, target):
113+
return [
115114
"name",
116115
"state",
117116
"job_count",
118117
"finished_job_count",
119118
"failed_job_count",
120119
"completeness",
121120
"failed_percentage",
122-
)
121+
]
123122

124-
def _to_store(self, store: Store):
125-
fnames = self._to_store_fnames()
126-
for rec in self:
127-
data = rec.read(fnames)[0]
128-
store.add(rec, data)
123+
def _to_store(self, store: Store, fields):
124+
store.add_records_fields(self, fields)

queue_job_batch/models/res_users.py

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -10,13 +10,8 @@ class Users(models.Model):
1010

1111
def _init_store_data(self, store):
1212
res = super()._init_store_data(store)
13-
store.add(
14-
{
15-
"hasQueueJobBatchUserGroup": self.env.user.has_group(
16-
"queue_job_batch.group_queue_job_batch_user"
17-
),
18-
}
19-
)
13+
has_it = self.env.user.has_group("queue_job_batch.group_queue_job_batch_user")
14+
store.add_global_values(hasQueueJobBatchUserGroup=has_it)
2015
return res
2116

2217
def _get_queue_job_batches(self):

queue_job_batch/static/src/components/QueueJobBatchMenu.esm.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ export class QueueJobBatchMenu extends Component {
3232
}
3333

3434
onBeforeOpen() {
35-
this.store.fetchData({systray_get_queue_job_batches: true});
35+
this.store.fetchStoreData("systray_get_queue_job_batches");
3636
}
3737

3838
getGroupInfo(batch) {

0 commit comments

Comments
 (0)