summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRaphael Collet <rco@openerp.com>2015-09-30 14:07:09 +0200
committerRaphael Collet <rco@openerp.com>2015-09-30 16:29:59 +0200
commitf739c38d587fe3d64fe875c3001eda4772e9d693 (patch)
tree4e788b4fee40db44f0db199ee6fff1bc4d909871
parent6784b1af7869d50ea396366aee38d9829d2b77c7 (diff)
[IMP] mail: trigger garbage collection of attachments from model `ir.autovacuum`
-rw-r--r--addons/mail/data/mail_data.xml13
-rw-r--r--addons/mail/models/__init__.py1
-rw-r--r--addons/mail/models/ir_autovacuum.py11
3 files changed, 12 insertions, 13 deletions
diff --git a/addons/mail/data/mail_data.xml b/addons/mail/data/mail_data.xml
index 97cd5c26513..6e8fec8a69f 100644
--- a/addons/mail/data/mail_data.xml
+++ b/addons/mail/data/mail_data.xml
@@ -28,19 +28,6 @@
<field name="priority">1000</field>
</record>
- <record id="ir_cron_mail_garbage_collect_attachments" model="ir.cron">
- <field name="name">Garbage Collect Mail Attachments</field>
- <field eval="True" name="active" />
- <field name="user_id" ref="base.user_root" />
- <field name="interval_number">1</field>
- <field name="interval_type">weeks</field>
- <field name="numbercall">-1</field>
- <field eval="False" name="doall" />
- <field name="model">mail.thread</field>
- <field name="function">_garbage_collect_attachments</field>
- <field name="args">()</field>
- </record>
-
<!-- Admin should not receivve emails at creation -->
<record id="base.partner_root" model="res.partner">
<field name="notify_email">none</field>
diff --git a/addons/mail/models/__init__.py b/addons/mail/models/__init__.py
index d24e5295cf0..1ba9746eb4e 100644
--- a/addons/mail/models/__init__.py
+++ b/addons/mail/models/__init__.py
@@ -15,4 +15,5 @@ import res_users
import res_config
import update
import ir_actions
+import ir_autovacuum
import html2text
diff --git a/addons/mail/models/ir_autovacuum.py b/addons/mail/models/ir_autovacuum.py
new file mode 100644
index 00000000000..37ea8d98fb1
--- /dev/null
+++ b/addons/mail/models/ir_autovacuum.py
@@ -0,0 +1,11 @@
+# -*- coding: utf-8 -*-
+# Part of Odoo. See LICENSE file for full copyright and licensing details.
+
+from openerp import models
+
+class AutoVacuum(models.TransientModel):
+ _inherit = 'ir.autovacuum'
+
+ def power_on(self, cr, uid, *args, **kwargs):
+ self.pool['mail.thread']._garbage_collect_attachments(cr, uid)
+ return super(AutoVacuum, self).power_on(cr, uid, *args, **kwargs)