From 6b2f3c4f88589ff47fbf0942685894f30bf1b4c2 Mon Sep 17 00:00:00 2001 From: Florent Xicluna Date: Mon, 26 May 2025 15:24:51 +0200 Subject: [PATCH 1/4] [IMP] queue_job: add Priority to Group-By and search --- queue_job/models/queue_job.py | 2 +- queue_job/views/queue_job_views.xml | 7 +++++++ 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/queue_job/models/queue_job.py b/queue_job/models/queue_job.py index 0af77c2559..97b187b7df 100644 --- a/queue_job/models/queue_job.py +++ b/queue_job/models/queue_job.py @@ -92,7 +92,7 @@ class QueueJob(models.Model): func_string = fields.Char(string="Task", readonly=True) state = fields.Selection(STATES, readonly=True, required=True, index=True) - priority = fields.Integer() + priority = fields.Integer(group_operator=False) exc_name = fields.Char(string="Exception", readonly=True) exc_message = fields.Char(string="Exception Message", readonly=True, tracking=True) exc_info = fields.Text(string="Exception Info", readonly=True) diff --git a/queue_job/views/queue_job_views.xml b/queue_job/views/queue_job_views.xml index f4b1d855c2..79aec95bc2 100644 --- a/queue_job/views/queue_job_views.xml +++ b/queue_job/views/queue_job_views.xml @@ -166,6 +166,7 @@ /> + @@ -210,6 +211,7 @@ + @@ -282,6 +284,11 @@ string="State" context="{'group_by': 'state'}" /> + Date: Mon, 2 Jun 2025 10:43:48 +0000 Subject: [PATCH 2/4] [UPD] Update queue_job.pot --- queue_job/i18n/queue_job.pot | 1 + 1 file changed, 1 insertion(+) diff --git a/queue_job/i18n/queue_job.pot b/queue_job/i18n/queue_job.pot index 024707c18f..31eddb3683 100644 --- a/queue_job/i18n/queue_job.pot +++ b/queue_job/i18n/queue_job.pot @@ -665,6 +665,7 @@ msgstr "" #. module: queue_job #: model:ir.model.fields,field_description:queue_job.field_queue_job__priority +#: model_terms:ir.ui.view,arch_db:queue_job.view_queue_job_search msgid "Priority" msgstr "" From aafafbad8b3ac09bae3807b8c8983a2dd0bd40a3 Mon Sep 17 00:00:00 2001 From: OCA-git-bot Date: Mon, 2 Jun 2025 10:46:08 +0000 Subject: [PATCH 3/4] [BOT] post-merge updates --- README.md | 2 +- queue_job/README.rst | 2 +- queue_job/__manifest__.py | 2 +- queue_job/static/description/index.html | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/README.md b/README.md index e852dd8a96..9a580e4051 100644 --- a/README.md +++ b/README.md @@ -24,7 +24,7 @@ addon | version | maintainers | summary [base_export_async](base_export_async/) | 14.0.1.0.1 | | Asynchronous export with job queue [base_import_async](base_import_async/) | 14.0.1.0.2 | | Import CSV files in the background [export_async_schedule](export_async_schedule/) | 14.0.1.0.1 | [![guewen](https://github.com/guewen.png?size=30px)](https://github.com/guewen) | Generate and send exports by emails on a schedule -[queue_job](queue_job/) | 14.0.3.10.0 | [![guewen](https://github.com/guewen.png?size=30px)](https://github.com/guewen) | Job Queue +[queue_job](queue_job/) | 14.0.3.11.0 | [![guewen](https://github.com/guewen.png?size=30px)](https://github.com/guewen) | Job Queue [queue_job_batch](queue_job_batch/) | 14.0.1.0.2 | | Job Queue Batch [queue_job_context](queue_job_context/) | 14.0.1.0.1 | [![AshishHirapara](https://github.com/AshishHirapara.png?size=30px)](https://github.com/AshishHirapara) | Queue Job, prepare context before enqueue keys [queue_job_cron](queue_job_cron/) | 14.0.2.0.0 | | Scheduled Actions as Queue Jobs diff --git a/queue_job/README.rst b/queue_job/README.rst index b6f92f97b0..fa60a3e401 100644 --- a/queue_job/README.rst +++ b/queue_job/README.rst @@ -7,7 +7,7 @@ Job Queue !! This file is generated by oca-gen-addon-readme !! !! changes will be overwritten. !! !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! - !! source digest: sha256:e7a4f68d9c4b4d117e1e9a6f0096eaf1fd4bf1914b38d934779c93c49958a31a + !! source digest: sha256:3aacd026b8d46dea0a3a200eecd16eb6592a97b8d31a84e6155481a3e5c223c6 !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! .. |badge1| image:: https://img.shields.io/badge/maturity-Mature-brightgreen.png diff --git a/queue_job/__manifest__.py b/queue_job/__manifest__.py index c8c69184b1..998201cba0 100644 --- a/queue_job/__manifest__.py +++ b/queue_job/__manifest__.py @@ -2,7 +2,7 @@ { "name": "Job Queue", - "version": "14.0.3.10.0", + "version": "14.0.3.11.0", "author": "Camptocamp,ACSONE SA/NV,Odoo Community Association (OCA)", "website": "https://github.com/OCA/queue", "license": "LGPL-3", diff --git a/queue_job/static/description/index.html b/queue_job/static/description/index.html index a6487b7d9e..4f5724dfaf 100644 --- a/queue_job/static/description/index.html +++ b/queue_job/static/description/index.html @@ -367,7 +367,7 @@

Job Queue

!! This file is generated by oca-gen-addon-readme !! !! changes will be overwritten. !! !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! -!! source digest: sha256:e7a4f68d9c4b4d117e1e9a6f0096eaf1fd4bf1914b38d934779c93c49958a31a +!! source digest: sha256:3aacd026b8d46dea0a3a200eecd16eb6592a97b8d31a84e6155481a3e5c223c6 !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! -->

Mature License: LGPL-3 OCA/queue Translate me on Weblate Try me on Runboat

This addon adds an integrated Job Queue to Odoo.

From e155a5a78ca98c142a598dd15cf1f7d9fd32d788 Mon Sep 17 00:00:00 2001 From: Weblate Date: Mon, 2 Jun 2025 10:46:17 +0000 Subject: [PATCH 4/4] Update translation files Updated by "Update PO files to match POT (msgmerge)" hook in Weblate. Translation: queue-14.0/queue-14.0-queue_job Translate-URL: https://translation.odoo-community.org/projects/queue-14-0/queue-14-0-queue_job/ --- queue_job/i18n/de.po | 1 + queue_job/i18n/es.po | 1 + queue_job/i18n/it.po | 1 + queue_job/i18n/ro.po | 1 + queue_job/i18n/zh_CN.po | 1 + 5 files changed, 5 insertions(+) diff --git a/queue_job/i18n/de.po b/queue_job/i18n/de.po index 930206e495..f0bb8cdb05 100644 --- a/queue_job/i18n/de.po +++ b/queue_job/i18n/de.po @@ -677,6 +677,7 @@ msgstr "Ausstehend" #. module: queue_job #: model:ir.model.fields,field_description:queue_job.field_queue_job__priority +#: model_terms:ir.ui.view,arch_db:queue_job.view_queue_job_search msgid "Priority" msgstr "Priorität" diff --git a/queue_job/i18n/es.po b/queue_job/i18n/es.po index 236d7d5c31..fdeab442e1 100644 --- a/queue_job/i18n/es.po +++ b/queue_job/i18n/es.po @@ -669,6 +669,7 @@ msgstr "" #. module: queue_job #: model:ir.model.fields,field_description:queue_job.field_queue_job__priority +#: model_terms:ir.ui.view,arch_db:queue_job.view_queue_job_search msgid "Priority" msgstr "" diff --git a/queue_job/i18n/it.po b/queue_job/i18n/it.po index 354afbe7fe..ccb189184c 100644 --- a/queue_job/i18n/it.po +++ b/queue_job/i18n/it.po @@ -673,6 +673,7 @@ msgstr "In attesa" #. module: queue_job #: model:ir.model.fields,field_description:queue_job.field_queue_job__priority +#: model_terms:ir.ui.view,arch_db:queue_job.view_queue_job_search msgid "Priority" msgstr "Priorità" diff --git a/queue_job/i18n/ro.po b/queue_job/i18n/ro.po index 35a4ca5e94..c1bb27ef03 100644 --- a/queue_job/i18n/ro.po +++ b/queue_job/i18n/ro.po @@ -672,6 +672,7 @@ msgstr "" #. module: queue_job #: model:ir.model.fields,field_description:queue_job.field_queue_job__priority +#: model_terms:ir.ui.view,arch_db:queue_job.view_queue_job_search msgid "Priority" msgstr "" diff --git a/queue_job/i18n/zh_CN.po b/queue_job/i18n/zh_CN.po index 406b066fc2..68746073b8 100644 --- a/queue_job/i18n/zh_CN.po +++ b/queue_job/i18n/zh_CN.po @@ -675,6 +675,7 @@ msgstr "等待" #. module: queue_job #: model:ir.model.fields,field_description:queue_job.field_queue_job__priority +#: model_terms:ir.ui.view,arch_db:queue_job.view_queue_job_search msgid "Priority" msgstr "优先级"