diff --git a/mail_base/README.rst b/mail_base/README.rst index ca298f7..6029868 100644 --- a/mail_base/README.rst +++ b/mail_base/README.rst @@ -1,7 +1,8 @@ Mail Base ========= -Modules doesn't introduce new features, but make built-in mail js features extendable. +* makes built-in mail js features extendable. +* handle ``search_default_*`` parameters in context. Usage ----- diff --git a/mail_base/static/src/js/base.js b/mail_base/static/src/js/base.js index a0712e6..68bce6b 100644 --- a/mail_base/static/src/js/base.js +++ b/mail_base/static/src/js/base.js @@ -60,6 +60,28 @@ var channel_seen = _.throttle(function (channel) { return ChannelModel.call('channel_seen', [[channel.id]], {}, {shadow: true}); }, 3000); +var ChatAction = core.action_registry.get('mail.chat.instant_messaging'); +ChatAction.include({ + start: function() { + var result = this._super.apply(this, arguments); + + var search_defaults = {}; + var context = this.action ? this.action.context : []; + _.each(context, function (value, key) { + var match = /^search_default_(.*)$/.exec(key); + if (match) { + search_defaults[match[1]] = value; + } + }); + this.searchview.defaults = search_defaults; + + var self = this; + return $.when(result).done(function() { + self.searchview.do_search(); + }); + } +}); + var MailTools = core.Class.extend({ send_native_notification: function (title, content) { diff --git a/res_partner_mails_count/__openerp__.py b/res_partner_mails_count/__openerp__.py index f60b70c..78a5450 100644 --- a/res_partner_mails_count/__openerp__.py +++ b/res_partner_mails_count/__openerp__.py @@ -6,15 +6,14 @@ "images": ['images/1.png'], "version": "1.0.0", - "author": "IT-Projects LLC", + "author": "IT-Projects LLC, Pavel Romanchenko", "website": "https://it-projects.info", - "license": "GPL-3", + "license": "LGPL-3", "price": 30.00, "currency": "EUR", "depends": [ - 'base', - 'mail', + 'mail_archives' ], "external_dependencies": {"python": [], "bin": []}, "data": [ 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 96415c6..0000000 --- a/res_partner_mails_count/static/src/js/main.js +++ /dev/null @@ -1,10 +0,0 @@ -// openerp.res_partner_mails_count = function(instance){ -// instance.mail.Wall.include({ -// init: function(){ -// this._super.apply(this, arguments); -// if(this.context.ignore_search_model){ -// delete this.defaults.model; -// } -// } -// }); -// }; 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 0c1573c..7b328d8 100644 --- a/res_partner_mails_count/views/res_partner_mails_count.xml +++ b/res_partner_mails_count/views/res_partner_mails_count.xml @@ -6,7 +6,7 @@ mail.chat.instant_messaging mail.message { - 'ignore_search_model': True, + 'active_id': 'channel_archive' }