From f11c963e335f6cfe0f10ecca642b7c0df5fd44f1 Mon Sep 17 00:00:00 2001 From: x620 Date: Fri, 15 Apr 2016 12:48:33 +0500 Subject: [PATCH] [FIX] res_partner_mails_count.xml use channel_archive [FIX] remove unused main.js and delete link in templates.xml to it --- res_partner_mails_count/static/src/js/main.js | 65 ------------------- res_partner_mails_count/templates.xml | 9 --- .../views/res_partner_mails_count.xml | 2 +- 3 files changed, 1 insertion(+), 75 deletions(-) delete mode 100644 res_partner_mails_count/static/src/js/main.js diff --git a/res_partner_mails_count/static/src/js/main.js b/res_partner_mails_count/static/src/js/main.js deleted file mode 100644 index e420b77..0000000 --- a/res_partner_mails_count/static/src/js/main.js +++ /dev/null @@ -1,65 +0,0 @@ -odoo.define('res_partner_mails_count.sent', function (require) { - "use strict"; - -var base_obj = require('mail_base.base'); - -//------------------------------------------------------------------------------- -var bus = require('bus.bus').bus; -var config = require('web.config'); -var core = require('web.core'); -var data = require('web.data'); -var Model = require('web.Model'); -var session = require('web.session'); -var time = require('web.time'); -var web_client = require('web.web_client'); - -var _t = core._t; -//------------------------------------------------------------------------------- - -// Inherit class and override methods -base_obj.MailTools.include({ - get_properties: function(msg){ - var properties = this._super.apply(this, arguments); - properties.is_sent_to = this.property_descr("channel_sent_to", msg, this); - return properties; - }, - - set_channel_flags: function(data, msg){ - this._super.apply(this, arguments); - msg.is_sent_to = false; - if (data.sent && data.author_id[0] == session.partner_id) { - if (data.partner_ids[0] && data.partner_ids[0][0] == 5){ - msg.is_sent_to = true; - } - } - - return msg; - }, - - get_channel_array: function(msg){ - var arr = this._super.apply(this, arguments); - return arr.concat('channel_sent_to'); - }, - - get_domain: function(channel){ - return (channel.id === "channel_sent_to") ? [ - ['sent', '=', true], - ['author_id.user_ids', 'in', [openerp.session.uid]] - ] : this._super.apply(this, arguments); - } -}); - -base_obj.chat_manager.is_ready.then(function(){ - // Add sent channel - base_obj.chat_manager.mail_tools.add_channel({ - id: "channel_sent_to", - name: _t("SentTo"), - type: "static" - }); - - return $.when(); -}); - -return base_obj.chat_manager; - -}); diff --git a/res_partner_mails_count/templates.xml b/res_partner_mails_count/templates.xml index 79f4b1a..11684e4 100644 --- a/res_partner_mails_count/templates.xml +++ b/res_partner_mails_count/templates.xml @@ -1,15 +1,6 @@ - - res.partner.mails.count res.partner diff --git a/res_partner_mails_count/views/res_partner_mails_count.xml b/res_partner_mails_count/views/res_partner_mails_count.xml index 68c00a9..7e3daf7 100644 --- a/res_partner_mails_count/views/res_partner_mails_count.xml +++ b/res_partner_mails_count/views/res_partner_mails_count.xml @@ -7,7 +7,7 @@ mail.message { 'ignore_search_model': True, - 'active_id': 'channel_sent_to' + 'active_id': 'channel_archive' }