Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 12 additions & 0 deletions queue_job/models/queue_job.py
Original file line number Diff line number Diff line change
Expand Up @@ -303,6 +303,18 @@ def requeue(self):
return {'type': 'ir.actions.act_window_close'}


class SetJobsToDone(models.TransientModel):
_inherit = 'queue.requeue.job'
_name = 'queue.jobs.to.done'
_description = 'Set all selected jobs to done'

@api.multi
def set_done(self):
jobs = self.job_ids
jobs.button_done()
return {'type': 'ir.actions.act_window_close'}


class JobChannel(models.Model):
_name = 'queue.job.channel'
_description = 'Job Channels'
Expand Down
2 changes: 2 additions & 0 deletions queue_job/readme/HISTORY.rst
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,8 @@
Next
~~~~

* [ADD] Ability to set several jobs to done using an multi-action
(port of `#59 <https://github.com/OCA/queue/pull/59>`_)
* [REF] Extract a method handling the post of a message when a job is failed,
allowing to modify this behavior from addons

Expand Down
27 changes: 26 additions & 1 deletion queue_job/views/queue_job_views.xml
Original file line number Diff line number Diff line change
Expand Up @@ -151,7 +151,22 @@
</group>
<footer>
<button name="requeue" string="Requeue" type="object" class="oe_highlight"/>
or
<button string="Cancel" class="oe_link" special="cancel"/>
</footer>
</form>
</field>
</record>

<record id="view_set_jobs_done" model="ir.ui.view">
<field name="name">Set Jobs to Done</field>
<field name="model">queue.jobs.to.done</field>
<field name="arch" type="xml">
<form string="Set jobs done">
<group string="The selected jobs will be set to done.">
<field name="job_ids" nolabel="1"/>
</group>
<footer>
<button name="set_done" string="Set to done" type="object" class="oe_highlight"/>
<button string="Cancel" class="oe_link" special="cancel"/>
</footer>
</form>
Expand All @@ -168,6 +183,16 @@
<field name="binding_model_id" ref="queue_job.model_queue_job" />
</record>

<record id="action_set_jobs_done" model="ir.actions.act_window">
<field name="name">Set jobs to done</field>
<field name="res_model">queue.jobs.to.done</field>
<field name="view_type">form</field>
<field name="view_mode">form</field>
<field name="view_id" ref="view_set_jobs_done"/>
<field name="target">new</field>
<field name="binding_model_id" ref="queue_job.model_queue_job" />
</record>

<record id="view_queue_job_channel_form" model="ir.ui.view">
<field name="name">queue.job.channel.form</field>
<field name="model">queue.job.channel</field>
Expand Down