[MIG] mail_tracking: Migrated to 10.0

mail_tracking/README.rst

@@ -63,7 +63,7 @@ These are all available status icons:
 
 .. image:: https://odoo-community.org/website/image/ir.attachment/5784_f2813bd/datas
    :alt: Try me on Runbot
-   :target: https://runbot.odoo-community.org/runbot/205/9.0
+   :target: https://runbot.odoo-community.org/runbot/205/10.0
 
 If you want to see all tracking emails and events you can go to
 

mail_tracking/__manifest__.py

@@ -5,20 +5,21 @@
 {
     "name": "Email tracking",
     "summary": "Email tracking system for all mails sent",
-    "version": "9.0.1.0.0",
+    "version": "10.0.1.0.0",
     "category": "Social Network",
     "website": "http://www.tecnativa.com",
     "author": "Tecnativa, "
               "Odoo Community Association (OCA)",
     "license": "AGPL-3",
     "application": False,
-    'installable': False,
+    'installable': True,
     "depends": [
         "decimal_precision",
         "mail",
     ],
     "data": [
         "data/tracking_data.xml",
+        "security/mail_tracking_email_security.xml",
         "security/ir.model.access.csv",
         "views/assets.xml",
         "views/mail_tracking_email_view.xml",

mail_tracking/controllers/main.py

@@ -4,24 +4,37 @@
 
 import werkzeug
 from psycopg2 import OperationalError
-from openerp import api, http, registry, SUPERUSER_ID
+from odoo import api, http, registry, SUPERUSER_ID
 import logging
 _logger = logging.getLogger(__name__)
 
 BLANK = 'R0lGODlhAQABAIAAANvf7wAAACH5BAEAAAAALAAAAAABAAEAAAICRAEAOw=='
 
 
-def _env_get(db):
+def _env_get(db, callback, tracking_id, event_type, **kw):
+    res = 'NOT FOUND'
     reg = False
-    try:
-        reg = registry(db)
-    except OperationalError:
-        _logger.warning("Selected BD '%s' not found", db)
-    except:  # pragma: no cover
-        _logger.warning("Selected BD '%s' connection error", db)
-    if reg:
-        return api.Environment(reg.cursor(), SUPERUSER_ID, {})
-    return False
+    current = http.request.db and db == http.request.db
+    env = current and http.request.env
+    if not env:
+        with api.Environment.manage():
+            try:
+                reg = registry(db)
+            except OperationalError:
+                _logger.warning("Selected BD '%s' not found", db)
+            except:  # pragma: no cover
+                _logger.warning("Selected BD '%s' connection error", db)
+            if reg:
+                _logger.info("New environment for database '%s'", db)
+                with reg.cursor() as new_cr:
+                    new_env = api.Environment(new_cr, SUPERUSER_ID, {})
+                    res = callback(new_env, tracking_id, event_type, **kw)
+                    new_env.cr.commit()
+    else:
+        # make sudo when reusing environment
+        env = env(user=SUPERUSER_ID)
+        res = callback(env, tracking_id, event_type, **kw)
+    return res
 
 
 class MailTrackingController(http.Controller):
@@ -35,49 +48,37 @@ def _request_metadata(self):
             'ua_family': request.user_agent.browser or False,
         }
 
+    def _tracking_open(self, env, tracking_id, event_type, **kw):
+        tracking_email = env['mail.tracking.email'].search([
+            ('id', '=', tracking_id),
+        ])
+        if tracking_email:
+            metadata = self._request_metadata()
+            tracking_email.event_create('open', metadata)
+        else:
+            _logger.warning(
+                "MailTracking email '%s' not found", tracking_id)
+
+    def _tracking_event(self, env, tracking_id, event_type, **kw):
+        metadata = self._request_metadata()
+        return env['mail.tracking.email'].event_process(
+            http.request, kw, metadata, event_type=event_type)
+
     @http.route('/mail/tracking/all/<string:db>',
                 type='http', auth='none', csrf=False)
     def mail_tracking_all(self, db, **kw):
-        env = _env_get(db)
-        if not env:
-            return 'NOT FOUND'
-        metadata = self._request_metadata()
-        response = env['mail.tracking.email'].event_process(
-            http.request, kw, metadata)
-        env.cr.commit()
-        env.cr.close()
-        return response
+        return _env_get(db, self._tracking_event, None, None, **kw)
 
     @http.route('/mail/tracking/event/<string:db>/<string:event_type>',
                 type='http', auth='none', csrf=False)
     def mail_tracking_event(self, db, event_type, **kw):
-        env = _env_get(db)
-        if not env:
-            return 'NOT FOUND'
-        metadata = self._request_metadata()
-        response = env['mail.tracking.email'].event_process(
-            http.request, kw, metadata, event_type=event_type)
-        env.cr.commit()
-        env.cr.close()
-        return response
+        return _env_get(db, self._tracking_event, None, event_type, **kw)
 
     @http.route('/mail/tracking/open/<string:db>'
                 '/<int:tracking_email_id>/blank.gif',
                 type='http', auth='none')
     def mail_tracking_open(self, db, tracking_email_id, **kw):
-        env = _env_get(db)
-        if env:
-            tracking_email = env['mail.tracking.email'].search([
-                ('id', '=', tracking_email_id),
-            ])
-            if tracking_email:
-                metadata = self._request_metadata()
-                tracking_email.event_create('open', metadata)
-            else:
-                _logger.warning(
-                    "MailTracking email '%s' not found", tracking_email_id)
-            env.cr.commit()
-            env.cr.close()
+        _env_get(db, self._tracking_open, tracking_email_id, None, **kw)
 
         # Always return GIF blank image
         response = werkzeug.wrappers.Response()

mail_tracking/data/tracking_data.xml

@@ -1,13 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- © 2016 Antonio Espinosa - <antonio.espinosa@tecnativa.com>
      License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html). -->
-<openerp>
-<data>
-
-<record forcecreate="True" id="decimal_tracking_timestamp" model="decimal.precision">
-    <field name="name">MailTracking Timestamp</field>
-    <field name="digits">6</field>
-</record>
-
-</data>
-</openerp>
+<odoo>
+    <record forcecreate="True" id="decimal_tracking_timestamp" model="decimal.precision">
+        <field name="name">MailTracking Timestamp</field>
+        <field name="digits">6</field>
+    </record>
+</odoo>

mail_tracking/models/ir_mail_server.py

@@ -4,7 +4,7 @@
 
 import re
 import threading
-from openerp import models, api, tools
+from odoo import models, api, tools
 
 
 class IrMailServer(models.Model):

mail_tracking/models/mail_mail.py

@@ -6,7 +6,7 @@
 from datetime import datetime
 from email.utils import COMMASPACE
 
-from openerp import models, api, fields
+from odoo import models, fields
 
 
 class MailMail(models.Model):
@@ -18,7 +18,7 @@ def _tracking_email_prepare(self, partner, email):
         email_to_list = email.get('email_to', [])
         email_to = COMMASPACE.join(email_to_list)
         return {
-            'name': email.get('subject', False),
+            'name': self.subject,
             'timestamp': '%.6f' % ts,
             'time': fields.Datetime.to_string(dt),
             'mail_id': self.id,
@@ -28,7 +28,6 @@ def _tracking_email_prepare(self, partner, email):
             'sender': self.email_from,
         }
 
-    @api.multi
     def send_get_email_dict(self, partner=None):
         email = super(MailMail, self).send_get_email_dict(partner=partner)
         vals = self._tracking_email_prepare(partner, email)

mail_tracking/models/mail_message.py

@@ -2,7 +2,7 @@
 # © 2016 Antonio Espinosa - <antonio.espinosa@tecnativa.com>
 # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html).
 
-from openerp import models, api
+from odoo import models, api
 
 
 class MailMessage(models.Model):
@@ -31,7 +31,6 @@ def _partner_tracking_status_get(self, tracking_email):
             status = tracking_status_map.get(tracking_email_status, 'unknown')
         return status
 
-    @api.multi
     def tracking_status(self):
         res = {}
         for message in self:
@@ -45,7 +44,7 @@ def tracking_status(self):
             for tracking in trackings:
                 status = self._partner_tracking_status_get(tracking)
                 recipient = (
-                    tracking.partner_id.display_name or tracking.recipient)
+                    tracking.partner_id.name or tracking.recipient)
                 partner_trackings.append((
                     status, tracking.id, recipient, tracking.partner_id.id))
                 if tracking.partner_id:
@@ -60,7 +59,7 @@ def tracking_status(self):
             for partner in partners:
                 # If there is partners not included, then status is 'unknown'
                 partner_trackings.append((
-                    'unknown', False, partner.display_name, partner.id))
+                    'unknown', False, partner.name, partner.id))
             res[message.id] = partner_trackings
         return res