Merge 54f96ea into 10b73c1

OCA · Jun 19, 2018 · ff8edd7 · ff8edd7
2 parents 10b73c1 + 54f96ea
commit ff8edd7
Show file tree

Hide file tree

Showing 2 changed files with 46 additions and 1 deletion.
diff --git a/queue_job/models/queue_job.py b/queue_job/models/queue_job.py
@@ -241,6 +241,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'

diff --git a/queue_job/views/queue_job_views.xml b/queue_job/views/queue_job_views.xml
@@ -150,7 +150,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">Requeue Jobs</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>
@@ -175,6 +190,24 @@
         <field name="model">queue.job</field>
     </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>
+    </record>
+
+    <record id="action_set_jobs_done_values" model="ir.values">
+        <field name="model_id" ref="model_queue_job" />
+        <field name="name">Set jobs to done</field>
+        <field name="key2">client_action_multi</field>
+        <field name="value" eval="'ir.actions.act_window,' + str(ref('action_set_jobs_done'))"/>
+        <field name="key">action</field>
+        <field name="model">queue.job</field>
+    </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>