From 9e3726a179fe19eca9b533522b119194d85a69f7 Mon Sep 17 00:00:00 2001 From: mreficent Date: Mon, 10 Jul 2017 13:28:35 +0200 Subject: [PATCH] [MIG] base_search_mail_content: Migration to 10.0 --- base_search_mail_content/README.rst | 12 +-- .../{__openerp__.py => __manifest__.py} | 7 +- .../data/trgm_index_data.xml | 6 +- base_search_mail_content/models/__init__.py | 3 +- .../models/mail_thread.py | 102 ++++++++---------- .../models/res_partner.py | 13 --- .../static/description/icon.png | Bin 0 -> 9455 bytes base_search_mail_content/tests/__init__.py | 3 + .../tests/test_base_search_mail_content.py | 25 +++++ .../views/trgm_index_view.xml | 44 ++++---- 10 files changed, 105 insertions(+), 110 deletions(-) rename base_search_mail_content/{__openerp__.py => __manifest__.py} (81%) delete mode 100644 base_search_mail_content/models/res_partner.py create mode 100644 base_search_mail_content/static/description/icon.png create mode 100644 base_search_mail_content/tests/__init__.py create mode 100644 base_search_mail_content/tests/test_base_search_mail_content.py diff --git a/base_search_mail_content/README.rst b/base_search_mail_content/README.rst index 5934ec02..276c6ff0 100644 --- a/base_search_mail_content/README.rst +++ b/base_search_mail_content/README.rst @@ -17,7 +17,7 @@ associated, based on the feedback that the person responsible for the ticket maintains, including conversations with the person that raised the issue. A user may often want to find issues or tickets, based on the past -conversations that were recorded, as much as he/she needs to search +conversations that were recorded, as much as he or she needs to search in their mail for past conversations. This module will add dynamically a field 'message_content' to the search view of @@ -30,9 +30,8 @@ Installation ============ This module depends on the module 'base_search_fuzzy' to ensure that -searches on emails are based on indexes. Please read carefully the install -instructions: -https://github.com/OCA/server-tools/blob/9.0/base_search_fuzzy/README.rst +searches on emails are based on indexes. Please read carefully the +`install instructions `_. This module installs by default the indexes that are required to perform the searches on mail messages. @@ -40,12 +39,12 @@ perform the searches on mail messages. Usage ===== -Go to any model that contains a chatter (e.g. Partners, Leads, ...). Search +Go to any model that contains a chatter (e.g. Contacts, ...). Search for content in field 'Message Content'. .. image:: https://odoo-community.org/website/image/ir.attachment/5784_f2813bd/datas :alt: Try me on Runbot - :target: https://runbot.odoo-community.org/runbot/server-tools/9.0 + :target: https://runbot.odoo-community.org/runbot/server-tools/10.0 Bug Tracker =========== @@ -71,7 +70,6 @@ Contributors * Lois Rilo Antelo * Aaron Henriquez - Maintainer ---------- diff --git a/base_search_mail_content/__openerp__.py b/base_search_mail_content/__manifest__.py similarity index 81% rename from base_search_mail_content/__openerp__.py rename to base_search_mail_content/__manifest__.py index db6d9b2d..45a7ed0a 100644 --- a/base_search_mail_content/__openerp__.py +++ b/base_search_mail_content/__manifest__.py @@ -6,16 +6,15 @@ { "name": "Base Search Mail Content", - "version": "9.0.1.0.0", + "version": "10.0.1.0.0", "author": "Eficent," "SerpentCS," "Odoo Community Association (OCA)", - "website": "http://www.eficent.com", + "website": "https://github.com/OCA/social", "category": "Social", "data": ["data/trgm_index_data.xml", "views/trgm_index_view.xml"], - "depends": ["mail", - "base_search_fuzzy"], + "depends": ["mail", "base_search_fuzzy"], "license": "AGPL-3", 'installable': True, } diff --git a/base_search_mail_content/data/trgm_index_data.xml b/base_search_mail_content/data/trgm_index_data.xml index 0a84c926..78a25d85 100644 --- a/base_search_mail_content/data/trgm_index_data.xml +++ b/base_search_mail_content/data/trgm_index_data.xml @@ -1,6 +1,5 @@ - - + gin @@ -32,5 +31,4 @@ search="[('model','=','mail.message'),('name','=','reply_to')]"/> - - + diff --git a/base_search_mail_content/models/__init__.py b/base_search_mail_content/models/__init__.py index 780d0d14..b0b43827 100644 --- a/base_search_mail_content/models/__init__.py +++ b/base_search_mail_content/models/__init__.py @@ -1,8 +1,7 @@ # -*- coding: utf-8 -*- -# © 2016 Eficent Business and IT Consulting Services S.L. +# © 2016-17 Eficent Business and IT Consulting Services S.L. # (http://www.eficent.com) # © 2016 Serpent Consulting Services Pvt. Ltd. () # License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl.html). from . import mail_thread -from . import res_partner diff --git a/base_search_mail_content/models/mail_thread.py b/base_search_mail_content/models/mail_thread.py index b8a0f116..822f3d44 100644 --- a/base_search_mail_content/models/mail_thread.py +++ b/base_search_mail_content/models/mail_thread.py @@ -1,13 +1,13 @@ # -*- coding: utf-8 -*- -# © 2016 Eficent Business and IT Consulting Services S.L. +# © 2016-17 Eficent Business and IT Consulting Services S.L. # (http://www.eficent.com) # © 2016 Serpent Consulting Services Pvt. Ltd. () # License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl.html). -from openerp import api, fields, models +from odoo import api, fields, models from lxml import etree -from openerp.osv import expression -from openerp.osv.orm import setup_modifiers +from odoo.osv import expression +from odoo.osv.orm import setup_modifiers class MailThread(models.AbstractModel): @@ -16,64 +16,52 @@ class MailThread(models.AbstractModel): def _search_message_content(self, operator, value): - main_operator = 'in' - if operator in expression.NEGATIVE_TERM_OPERATORS: - main_operator = 'not in' - operators = {'!=': '=', 'not like': 'like', - 'not ilike': 'ilike', 'not in': 'in'} - operator = operators[operator] - domain = [('model', '=', self._name), '|', '|', '|', '|', - ('record_name', operator, value), - ('subject', operator, value), ('body', operator, value), - ('email_from', operator, value), - ('reply_to', operator, value)] - recs = self.env['mail.message'].search(domain) - return [('id', main_operator, recs.mapped('res_id'))] - - @api.multi - def _compute_message_content(self): - """ We don't really need to show any content. This field is to be - used only by searches""" - return '' + model_domain = [('model', '=', self._name)] + if operator not in expression.NEGATIVE_TERM_OPERATORS: + model_domain += ["|"] * 4 + model_domain += [ + ('record_name', operator, value), + ('subject', operator, value), + ('body', operator, value), + ('email_from', operator, value), + ('reply_to', operator, value) + ] + recs = self.env['mail.message'].search(model_domain) + return [('id', 'in', recs.mapped('res_id'))] message_content = fields.Text( string='Message Content', help='Message content, to be used only in searches', - compute="_compute_message_content", + compute=lambda self: False, search='_search_message_content') - -_base_fields_view_get = models.BaseModel.fields_view_get - - -@api.model -def _custom_fields_view_get(self, view_id=None, view_type='form', - toolbar=False, submenu=False): - """ - Override to add message_ids field in all the objects - that inherits mail.thread - """ - # Tricky super call - res = _base_fields_view_get(self, view_id=view_id, view_type=view_type, - toolbar=toolbar, submenu=submenu) - if view_type == 'search' and self._fields.get('message_content'): - doc = etree.XML(res['arch']) - res['fields'].update({ - 'message_content': { - 'type': 'char', - 'string': 'Message content', - } - }) - - for node in doc.xpath("//field[1]"): - # Add message_content in search view - elem = etree.Element('field', { - 'name': 'message_content', + @api.model + def fields_view_get(self, view_id=None, view_type='form', toolbar=False, + submenu=False): + """ + Override to add message_content field in all the objects + that inherits mail.thread + """ + res = super(MailThread, self).fields_view_get( + view_id=view_id, view_type=view_type, toolbar=toolbar, + submenu=submenu) + if view_type == 'search' and self._fields.get('message_content'): + doc = etree.XML(res['arch']) + res['fields'].update({ + 'message_content': { + 'type': 'char', + 'string': 'Message Content', + } }) - setup_modifiers(elem) - node.addnext(elem) - res['arch'] = etree.tostring(doc) - return res - -models.BaseModel.fields_view_get = _custom_fields_view_get + for node in doc.xpath("//field[1]"): + # Add message_content in search view + elem = etree.Element( + 'field', + { + 'name': 'message_content', + }) + setup_modifiers(elem) + node.addnext(elem) + res['arch'] = etree.tostring(doc) + return res diff --git a/base_search_mail_content/models/res_partner.py b/base_search_mail_content/models/res_partner.py deleted file mode 100644 index 6aa6da6c..00000000 --- a/base_search_mail_content/models/res_partner.py +++ /dev/null @@ -1,13 +0,0 @@ -# -*- coding: utf-8 -*- -# © 2016 Eficent Business and IT Consulting Services S.L. -# (http://www.eficent.com) -# © 2016 Serpent Consulting Services Pvt. Ltd. () -# License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl.html). - -from openerp import models - - -class Partner(models.Model): - - _name = 'res.partner' - _inherit = ['res.partner', 'mail.thread'] diff --git a/base_search_mail_content/static/description/icon.png b/base_search_mail_content/static/description/icon.png new file mode 100644 index 0000000000000000000000000000000000000000..3a0328b516c4980e8e44cdb63fd945757ddd132d GIT binary patch literal 9455 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 z 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 Xviia!U7SGha1wx#SCgwmn*{w2TRX*I literal 0 HcmV?d00001 diff --git a/base_search_mail_content/tests/__init__.py b/base_search_mail_content/tests/__init__.py new file mode 100644 index 00000000..915ca325 --- /dev/null +++ b/base_search_mail_content/tests/__init__.py @@ -0,0 +1,3 @@ +# -*- coding: utf-8 -*- +# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html). +from . import test_base_search_mail_content diff --git a/base_search_mail_content/tests/test_base_search_mail_content.py b/base_search_mail_content/tests/test_base_search_mail_content.py new file mode 100644 index 00000000..38b2c3eb --- /dev/null +++ b/base_search_mail_content/tests/test_base_search_mail_content.py @@ -0,0 +1,25 @@ +# -*- coding: utf-8 -*- +# Copyright 2017 Eficent Business and IT Consulting Services S.L. +# (http://www.eficent.com) +# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html). +from odoo.tests.common import TransactionCase + + +class TestBaseSearchMailContent(TransactionCase): + def setUp(self): + super(TestBaseSearchMailContent, self).setUp() + self.channel_obj = self.env["mail.channel"] + + def test_base_search_mail_content_1(self): + res = self.channel_obj.search( + [('message_content', 'ilike', 'xxxyyyzzz')]) + self.assertFalse(res, "You have a channel with xxxyyyzzz :O") + + def test_base_search_mail_content_2(self): + res = self.channel_obj.load_views( + [[False, 'search']], {'load_fields': False, + 'load_filters': True, + 'toolbar': True}) + self.assertIn( + 'message_content', res['fields_views']['search']['fields'], + "message_content field was not detected") diff --git a/base_search_mail_content/views/trgm_index_view.xml b/base_search_mail_content/views/trgm_index_view.xml index 304a8365..ed3a55a8 100644 --- a/base_search_mail_content/views/trgm_index_view.xml +++ b/base_search_mail_content/views/trgm_index_view.xml @@ -1,29 +1,27 @@ - - + - - trgm.index.view.form - trgm.index - - - - [('ttype', 'in', ['char', 'text', 'html'])] - "You can either select a field of type 'text', 'char' or 'html'." - + + trgm.index.view.form + trgm.index + + + + [('ttype', 'in', ['char', 'text', 'html'])] + "You can either select a field of type 'text', 'char' or 'html'." - + + - - trgm.index.view.tree - trgm.index - - - - "You can either select a field of type 'text', 'char' or 'html'." - + + trgm.index.view.tree + trgm.index + + + + "You can either select a field of type 'text', 'char' or 'html'." - + + - - +