diff --git a/.travis.yml b/.travis.yml index 91f44f2..06a13df 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,7 +1,7 @@ language: python python: - - "2.7" + - "3.5" #dist: trusty sudo: false @@ -16,7 +16,7 @@ addons: env: global: - - VERSION="10.0" TESTS="0" LINT_CHECK="0" UNIT_TEST="0" + - VERSION="11.0" TESTS="0" LINT_CHECK="0" UNIT_TEST="0" - PYLINT_ODOO_JSLINTRC="/home/travis/maintainer-quality-tools/travis/cfg/.jslintrc" matrix: @@ -24,9 +24,6 @@ env: - TESTS="1" ODOO_REPO="odoo/odoo" MAKEPOT="1" - TESTS="1" ODOO_REPO="OCA/OCB" -virtualenv: - system_site_packages: true - install: - pip install anybox.testing.openerp - git clone https://github.com/it-projects-llc/maintainer-quality-tools.git ${HOME}/maintainer-quality-tools diff --git a/README.md b/README.md index f34a62e..4190d31 100644 --- a/README.md +++ b/README.md @@ -1,7 +1,7 @@ -[![Build Status](https://travis-ci.com/it-projects-llc/mail-addons.svg?branch=10.0)](https://travis-ci.com/it-projects-llc/mail-addons) +[![Build Status](https://travis-ci.com/it-projects-llc/mail-addons.svg?branch=11.0)](https://travis-ci.com/it-projects-llc/mail-addons) # mail-addons -Odoo (OpenERP) mail addons +Odoo mail addons List of repositories: --------------------- @@ -9,7 +9,6 @@ List of repositories: * https://github.com/it-projects-llc/misc-addons * https://github.com/it-projects-llc/pos-addons * https://github.com/it-projects-llc/mail-addons -* https://github.com/it-projects-llc/rental-addons * https://github.com/it-projects-llc/access-addons * https://github.com/it-projects-llc/website-addons * https://github.com/it-projects-llc/l10n-addons diff --git a/mail_all/README.rst b/mail_all/README.rst index 48d4e55..d0b7702 100644 --- a/mail_all/README.rst +++ b/mail_all/README.rst @@ -2,15 +2,38 @@ Show all messages =================== -Adds ``Discuss / All`` menu, that shows all messages accesable by current user +Adds ``Discuss / All`` menu, that shows all messages accesable by current user. + +Credits +======= + +Contributors +------------ +* Pavel Romanchenko + +Sponsors +-------- +* `IT-Projects LLC `__ + +Maintainers +----------- +* `IT-Projects LLC `__ + + To get a guaranteed support you are kindly requested to purchase the module at `odoo apps store `__. + + Thank you for understanding! + + `IT-Projects Team `__ Further information -------------------- +=================== + +Demo: http://runbot.it-projects.info/demo/mail_addons/11.0 -HTML Description: https://apps.odoo.com/apps/modules/9.0/mail_all/ +HTML Description: https://apps.odoo.com/apps/modules/11.0/mail_all/ -Usage instructions: ``__ +Usage instructions: ``_ -Changelog: ``__ +Changelog: ``_ -Tested on Odoo 9.0 d3dd4161ad0598ebaa659fbd083457c77aa9448d +Tested on Odoo 11.0 ecbf7aa4714479229658d14cce28fa00376ed390 diff --git a/mail_all/__init__.py b/mail_all/__init__.py index cde864b..e69de29 100644 --- a/mail_all/__init__.py +++ b/mail_all/__init__.py @@ -1,3 +0,0 @@ -# -*- coding: utf-8 -*- - -from . import models diff --git a/mail_all/__manifest__.py b/mail_all/__manifest__.py index f9b4d39..1ffed98 100644 --- a/mail_all/__manifest__.py +++ b/mail_all/__manifest__.py @@ -1,10 +1,11 @@ -# -*- coding: utf-8 -*- { "name": "Show all messages", "summary": """Checkout all messages where you have access""", "category": "Discuss", + # "live_test_url": "", "images": ['images/1.jpg'], - "version": "1.0.0", + "version": "11.0.1.0.0", + "application": False, "author": "IT-Projects LLC, Pavel Romanchenko", "support": "apps@it-projects.info", @@ -24,6 +25,12 @@ "static/src/xml/menu.xml", ], "demo": [], + + "post_load": None, + "pre_init_hook": None, + "post_init_hook": None, + "uninstall_hook": None, + 'installable': True, "auto_install": False, } diff --git a/mail_all/doc/changelog.rst b/mail_all/doc/changelog.rst index 5f35720..9ee2b48 100644 --- a/mail_all/doc/changelog.rst +++ b/mail_all/doc/changelog.rst @@ -1,6 +1,3 @@ -Updates -======= - `1.0.0` ------- diff --git a/mail_all/doc/index.rst b/mail_all/doc/index.rst index 30b2245..350d915 100644 --- a/mail_all/doc/index.rst +++ b/mail_all/doc/index.rst @@ -2,6 +2,16 @@ Show all messages =================== +Installation +============ + +* `Install `__ this module in a usual way + +Configuration +============= + +This module does not require special configuration. + Usage ===== diff --git a/mail_all/i18n/de.po b/mail_all/i18n/de.po index 3dae557..dc28754 100644 --- a/mail_all/i18n/de.po +++ b/mail_all/i18n/de.po @@ -7,10 +7,10 @@ # msgid "" msgstr "" -"Project-Id-Version: Odoo Server 10.0\n" +"Project-Id-Version: Odoo Server 11.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2018-05-05 23:11+0000\n" -"PO-Revision-Date: 2017-06-23 14:31+0000\n" +"POT-Creation-Date: 2018-05-05 23:09+0000\n" +"PO-Revision-Date: 2018-04-21 00:05+0000\n" "Last-Translator: Dawid Runowski , 2019\n" "Language-Team: German (https://www.transifex.com/it-projects-llc/teams/76080/" "de/)\n" @@ -22,7 +22,7 @@ msgstr "" #. module: mail_all #. openerp-web -#: code:addons/mail_all/static/src/js/mail_all.js:56 +#: code:addons/mail_all/static/src/js/mail_all.js:49 #: code:addons/mail_all/static/src/xml/menu.xml:7 #, python-format msgid "All messages" @@ -33,4 +33,4 @@ msgstr "Alle Nachrichten" #: code:addons/mail_all/static/src/xml/menu.xml:15 #, python-format msgid "No messages" -msgstr "Alle Nachrichten" +msgstr "Keine Nachrichten" diff --git a/mail_all/i18n/es.po b/mail_all/i18n/es.po index cdf39bc..8705702 100644 --- a/mail_all/i18n/es.po +++ b/mail_all/i18n/es.po @@ -6,10 +6,10 @@ # Randall Castro , 2018 msgid "" msgstr "" -"Project-Id-Version: Odoo Server 10.0\n" +"Project-Id-Version: Odoo Server 11.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2017-12-19 16:49+0000\n" -"PO-Revision-Date: 2017-12-19 16:49+0000\n" +"POT-Creation-Date: 2018-04-21 23:07+0000\n" +"PO-Revision-Date: 2018-04-21 23:07+0000\n" "Last-Translator: Randall Castro , 2018\n" "Language-Team: Spanish (https://www.transifex.com/it-projects-llc/" "teams/76080/es/)\n" @@ -21,7 +21,7 @@ msgstr "" #. module: mail_all #. openerp-web -#: code:addons/mail_all/static/src/js/mail_all.js:56 +#: code:addons/mail_all/static/src/js/mail_all.js:49 #: code:addons/mail_all/static/src/xml/menu.xml:7 #, python-format msgid "All messages" diff --git a/mail_all/i18n/mail_all.pot b/mail_all/i18n/mail_all.pot index efeb918..62e0855 100644 --- a/mail_all/i18n/mail_all.pot +++ b/mail_all/i18n/mail_all.pot @@ -4,7 +4,7 @@ # msgid "" msgstr "" -"Project-Id-Version: Odoo Server 10.0\n" +"Project-Id-Version: Odoo Server 11.0\n" "Report-Msgid-Bugs-To: \n" "Last-Translator: <>\n" "Language-Team: \n" @@ -15,7 +15,7 @@ msgstr "" #. module: mail_all #. openerp-web -#: code:addons/mail_all/static/src/js/mail_all.js:56 +#: code:addons/mail_all/static/src/js/mail_all.js:49 #: code:addons/mail_all/static/src/xml/menu.xml:7 #, python-format msgid "All messages" diff --git a/mail_all/i18n/sl.po b/mail_all/i18n/sl.po index 1c3ab4e..ea1c4dc 100644 --- a/mail_all/i18n/sl.po +++ b/mail_all/i18n/sl.po @@ -7,10 +7,10 @@ # msgid "" msgstr "" -"Project-Id-Version: Odoo Server 10.0\n" +"Project-Id-Version: Odoo Server 11.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2018-05-05 23:11+0000\n" -"PO-Revision-Date: 2017-06-23 14:31+0000\n" +"POT-Creation-Date: 2018-05-05 23:09+0000\n" +"PO-Revision-Date: 2018-04-21 00:05+0000\n" "Last-Translator: Matjaz Mozetic , 2019\n" "Language-Team: Slovenian (https://www.transifex.com/it-projects-llc/" "teams/76080/sl/)\n" @@ -23,7 +23,7 @@ msgstr "" #. module: mail_all #. openerp-web -#: code:addons/mail_all/static/src/js/mail_all.js:56 +#: code:addons/mail_all/static/src/js/mail_all.js:49 #: code:addons/mail_all/static/src/xml/menu.xml:7 #, python-format msgid "All messages" diff --git a/mail_all/models/__init__.py b/mail_all/models/__init__.py deleted file mode 100644 index 40a96af..0000000 --- a/mail_all/models/__init__.py +++ /dev/null @@ -1 +0,0 @@ -# -*- coding: utf-8 -*- diff --git a/mail_all/static/description/index.html b/mail_all/static/description/index.html index e2a9a06..58a5857 100644 --- a/mail_all/static/description/index.html +++ b/mail_all/static/description/index.html @@ -38,6 +38,8 @@ This menu shows all messages.
diff --git a/mail_all/static/src/css/mail_all.css b/mail_all/static/src/css/mail_all.css new file mode 100644 index 0000000..010e720 --- /dev/null +++ b/mail_all/static/src/css/mail_all.css @@ -0,0 +1,3 @@ +.o_channel_name.mail_all i { + margin-right: 4px; +} \ No newline at end of file diff --git a/mail_all/static/src/js/mail_all.js b/mail_all/static/src/js/mail_all.js index 467ac11..1873f9e 100644 --- a/mail_all/static/src/js/mail_all.js +++ b/mail_all/static/src/js/mail_all.js @@ -1,20 +1,10 @@ odoo.define('mail_all.all', function (require) { "use strict"; -var base_obj = require('mail_base.base'); - -//------------------------------------------------------------------------------- -var bus = require('bus.bus').bus; -var config = require('web.config'); +var chat_manager = require('mail_base.base').chat_manager; 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 _lt = core._lt; -//------------------------------------------------------------------------------- var ChatAction = core.action_registry.get('mail.chat.instant_messaging'); ChatAction.include({ @@ -25,41 +15,43 @@ ChatAction.include({ } }); -// Inherit class and override methods -base_obj.MailTools.include({ - get_properties: function(msg){ - var properties = this._super.apply(this, arguments); - properties.is_all = this.property_descr("channel_all", msg, this); - return properties; - }, +// override methods +var chat_manager_super = _.clone(chat_manager); - set_channel_flags: function(data, msg){ - this._super.apply(this, arguments); - msg.is_all = data.author_id != 'ODOOBOT'; - return msg; - }, +chat_manager.get_properties = function (msg) { + var properties = chat_manager_super.get_properties.apply(this, arguments); + properties.is_all = this.property_descr("channel_all", msg, this); + return properties; +}; - get_channel_array: function(msg){ - var arr = this._super.apply(this, arguments); - return arr.concat('channel_all'); - }, +chat_manager.set_channel_flags = function (data, msg) { + chat_manager_super.set_channel_flags.apply(this, arguments); + msg.is_all = data.author_id !== 'ODOOBOT'; + return msg; +}; - get_domain: function(channel){ - return (channel.id === "channel_all") ? [] : this._super.apply(this, arguments); - } -}); +chat_manager.get_channel_array = function (msg) { + var arr = chat_manager_super.get_channel_array.apply(this, arguments); + return arr.concat('channel_all'); +}; -base_obj.chat_manager.is_ready.then(function(){ +chat_manager.get_domain = function (channel) { + return (channel.id === "channel_all") + ? [] + : chat_manager_super.get_domain.apply(this, arguments); +}; + + +chat_manager.is_ready.then(function () { // Add all channel - base_obj.chat_manager.mail_tools.add_channel({ + chat_manager.add_channel({ id: "channel_all", name: _lt("All messages"), type: "static" }); - return $.when(); }); -return base_obj.chat_manager; +return chat_manager; }); diff --git a/mail_all/static/src/xml/menu.xml b/mail_all/static/src/xml/menu.xml index 8ad1bcb..1ed9bdc 100644 --- a/mail_all/static/src/xml/menu.xml +++ b/mail_all/static/src/xml/menu.xml @@ -3,7 +3,7 @@ -
+
All messages
diff --git a/mail_all/tests/__init__.py b/mail_all/tests/__init__.py index cadc614..a43ec20 100644 --- a/mail_all/tests/__init__.py +++ b/mail_all/tests/__init__.py @@ -1,3 +1,2 @@ -# -*- coding: utf-8 -*- from . import test_js diff --git a/mail_all/tests/test_js.py b/mail_all/tests/test_js.py index f001c6b..da8cf40 100644 --- a/mail_all/tests/test_js.py +++ b/mail_all/tests/test_js.py @@ -1,4 +1,3 @@ -# -*- coding: utf-8 -*- import odoo.tests diff --git a/mail_all/views/templates.xml b/mail_all/views/templates.xml index 69fa5ed..d68bc72 100644 --- a/mail_all/views/templates.xml +++ b/mail_all/views/templates.xml @@ -5,6 +5,7 @@ name="mail_all_assets_backend" inherit_id="web.assets_backend"> + diff --git a/mail_archives/README.rst b/mail_archives/README.rst index dd0cac2..965deec 100644 --- a/mail_archives/README.rst +++ b/mail_archives/README.rst @@ -1,15 +1,39 @@ -Mail Archives -============= +=============== + Mail Archives +=============== Adds Archive menu, which shows sent/received messages -Usage ------ -Click Discuss/Archive menu -- sent/received messages are displayed +Credits +======= + +Contributors +------------ +* Pavel Romanchenko + +Sponsors +-------- +* `IT-Projects LLC `__ + +Maintainers +----------- +* `IT-Projects LLC `__ + + To get a guaranteed support you are kindly requested to purchase the module at `odoo apps store `__. + + Thank you for understanding! + + `IT-Projects Team `__ Further information -------------------- +=================== + +Demo: http://runbot.it-projects.info/demo/mail_addons/11.0 + +HTML Description: https://apps.odoo.com/apps/modules/11.0/mail_archives/ + +Usage instructions: ``_ -HTML Description: https://apps.odoo.com/apps/modules/9.0/mail_archives/ +Changelog: ``_ -Tested on Odoo 9.0 b9f206953e3f877adf18643f154d1262842564ee +Tested on Odoo 11.0 ecbf7aa4714479229658d14cce28fa00376ed390 diff --git a/mail_archives/__init__.py b/mail_archives/__init__.py index 40a96af..e69de29 100644 --- a/mail_archives/__init__.py +++ b/mail_archives/__init__.py @@ -1 +0,0 @@ -# -*- coding: utf-8 -*- diff --git a/mail_archives/__manifest__.py b/mail_archives/__manifest__.py index 8dd83b3..ca430d2 100644 --- a/mail_archives/__manifest__.py +++ b/mail_archives/__manifest__.py @@ -1,10 +1,9 @@ -# -*- coding: utf-8 -*- { "name": "Mail archives", "summary": """Adds menu to find old messages""", "category": "Discuss", "images": ['images/1.jpg'], - "version": "1.0.0", + "version": "11.0.1.0.0", "author": "IT-Projects LLC, Pavel Romanchenko", "support": "apps@it-projects.info", diff --git a/mail_attachment_popup/doc/changelog.rst b/mail_archives/doc/changelog.rst similarity index 100% rename from mail_attachment_popup/doc/changelog.rst rename to mail_archives/doc/changelog.rst diff --git a/mail_archives/doc/index.rst b/mail_archives/doc/index.rst new file mode 100644 index 0000000..4df88f5 --- /dev/null +++ b/mail_archives/doc/index.rst @@ -0,0 +1,20 @@ +============== + Mail Archives +============== + +Installation +============ + +* `Install `__ this module in a usual way + +Configuration +============= + +This module does not require special configuration. + +Usage +===== + +* Open ``Discuss``. +* Click ``Archive``. +* Sent/received messages are displayed. diff --git a/mail_archives/i18n/de.po b/mail_archives/i18n/de.po index 16f1d2c..14a4801 100644 --- a/mail_archives/i18n/de.po +++ b/mail_archives/i18n/de.po @@ -7,10 +7,10 @@ # msgid "" msgstr "" -"Project-Id-Version: Odoo Server 10.0\n" +"Project-Id-Version: Odoo Server 11.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2018-05-05 23:11+0000\n" -"PO-Revision-Date: 2017-06-23 14:31+0000\n" +"POT-Creation-Date: 2018-05-05 23:09+0000\n" +"PO-Revision-Date: 2018-04-21 00:05+0000\n" "Last-Translator: Dawid Runowski , 2019\n" "Language-Team: German (https://www.transifex.com/it-projects-llc/teams/76080/" "de/)\n" @@ -22,7 +22,7 @@ msgstr "" #. module: mail_archives #. openerp-web -#: code:addons/mail_archives/static/src/js/archives.js:76 +#: code:addons/mail_archives/static/src/js/archives.js:68 #: code:addons/mail_archives/static/src/xml/menu.xml:7 #, python-format msgid "Archive" diff --git a/mail_archives/i18n/es.po b/mail_archives/i18n/es.po index 1154b68..74939c8 100644 --- a/mail_archives/i18n/es.po +++ b/mail_archives/i18n/es.po @@ -6,10 +6,10 @@ # Randall Castro , 2018 msgid "" msgstr "" -"Project-Id-Version: Odoo Server 10.0\n" +"Project-Id-Version: Odoo Server 11.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2017-12-19 16:49+0000\n" -"PO-Revision-Date: 2017-12-19 16:49+0000\n" +"POT-Creation-Date: 2018-04-21 23:07+0000\n" +"PO-Revision-Date: 2018-04-21 23:07+0000\n" "Last-Translator: Randall Castro , 2018\n" "Language-Team: Spanish (https://www.transifex.com/it-projects-llc/" "teams/76080/es/)\n" @@ -21,7 +21,7 @@ msgstr "" #. module: mail_archives #. openerp-web -#: code:addons/mail_archives/static/src/js/archives.js:76 +#: code:addons/mail_archives/static/src/js/archives.js:68 #: code:addons/mail_archives/static/src/xml/menu.xml:7 #, python-format msgid "Archive" @@ -32,4 +32,4 @@ msgstr "Archivo" #: code:addons/mail_archives/static/src/xml/menu.xml:15 #, python-format msgid "Archive is empty" -msgstr "El archivo está vacío" +msgstr "Archivo está vacío" diff --git a/mail_archives/i18n/mail_archives.pot b/mail_archives/i18n/mail_archives.pot index 0c78d7c..306f7ae 100644 --- a/mail_archives/i18n/mail_archives.pot +++ b/mail_archives/i18n/mail_archives.pot @@ -4,7 +4,7 @@ # msgid "" msgstr "" -"Project-Id-Version: Odoo Server 10.0\n" +"Project-Id-Version: Odoo Server 11.0\n" "Report-Msgid-Bugs-To: \n" "Last-Translator: <>\n" "Language-Team: \n" @@ -15,7 +15,7 @@ msgstr "" #. module: mail_archives #. openerp-web -#: code:addons/mail_archives/static/src/js/archives.js:76 +#: code:addons/mail_archives/static/src/js/archives.js:68 #: code:addons/mail_archives/static/src/xml/menu.xml:7 #, python-format msgid "Archive" diff --git a/mail_archives/i18n/sl.po b/mail_archives/i18n/sl.po index 7a344d0..2261e73 100644 --- a/mail_archives/i18n/sl.po +++ b/mail_archives/i18n/sl.po @@ -7,10 +7,10 @@ # msgid "" msgstr "" -"Project-Id-Version: Odoo Server 10.0\n" +"Project-Id-Version: Odoo Server 11.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2018-05-05 23:11+0000\n" -"PO-Revision-Date: 2017-06-23 14:31+0000\n" +"POT-Creation-Date: 2018-05-05 23:09+0000\n" +"PO-Revision-Date: 2018-04-21 00:05+0000\n" "Last-Translator: Matjaz Mozetic , 2019\n" "Language-Team: Slovenian (https://www.transifex.com/it-projects-llc/" "teams/76080/sl/)\n" @@ -23,7 +23,7 @@ msgstr "" #. module: mail_archives #. openerp-web -#: code:addons/mail_archives/static/src/js/archives.js:76 +#: code:addons/mail_archives/static/src/js/archives.js:68 #: code:addons/mail_archives/static/src/xml/menu.xml:7 #, python-format msgid "Archive" diff --git a/mail_archives/static/description/index.html b/mail_archives/static/description/index.html index c0f016e..0b01710 100644 --- a/mail_archives/static/description/index.html +++ b/mail_archives/static/description/index.html @@ -38,6 +38,8 @@ This menu shows archive messages, i.e. ones you sent or received.
@@ -57,7 +59,7 @@ This menu shows archive messages, i.e. ones you sent or received. -o-transform: rotate(6deg); -moz-transform: rotate(6deg); -ms-transform: rotate(6deg);"> - Tested on Odoo
10.0 community + Tested on Odoo
11.0 community
- Tested on Odoo
10.0 enterprise + Tested on Odoo
11.0 enterprise
diff --git a/mail_archives/static/src/css/archives.css b/mail_archives/static/src/css/archives.css new file mode 100644 index 0000000..31acc5f --- /dev/null +++ b/mail_archives/static/src/css/archives.css @@ -0,0 +1,3 @@ +.o_channel_name.mail_archives i { + margin-right: 4px; +} \ No newline at end of file diff --git a/mail_archives/static/src/js/archives.js b/mail_archives/static/src/js/archives.js index 8134ac2..7fb0969 100644 --- a/mail_archives/static/src/js/archives.js +++ b/mail_archives/static/src/js/archives.js @@ -1,31 +1,23 @@ odoo.define('mail_archives.archives', 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 chat_manager = require('mail_base.base').chat_manager; var _lt = core._lt; -//------------------------------------------------------------------------------- + var ChatAction = core.action_registry.get('mail.chat.instant_messaging'); ChatAction.include({ - init: function(parent, action, options) { + init: function (parent, action, options) { this._super.apply(this, arguments); var channel_name = 'channel_archive'; // Add channel Archive for enable "display_subject" option this.channels_display_subject.push(channel_name); }, - - update_message_on_current_channel: function(current_channel_id, message){ + + update_message_on_current_channel: function (current_channel_id, message){ var result = this._super.apply(this, arguments); var archive = current_channel_id === "channel_archive" && !message.is_archive; return archive || result; @@ -33,53 +25,52 @@ ChatAction.include({ }); // Inherit class and override methods -base_obj.MailTools.include({ - get_properties: function(msg){ - var properties = this._super.apply(this, arguments); - properties.is_archive = this.property_descr("channel_archive", msg, this); - return properties; - }, - set_channel_flags: function(data, msg){ - this._super.apply(this, arguments); - // Get recipients ids - var recipients_ids = []; - for (var i = 0; i < (data.partner_ids || []).length; i++){ - recipients_ids.push(data.partner_ids[i][0]); - } - - // If author or recipient - if (data.author_id[0] === session.partner_id || recipients_ids.indexOf(session.partner_id) != -1) { - msg.is_archive = true; - } - - return msg; - }, +var chat_manager_super = _.clone(chat_manager); - get_channel_array: function(msg){ - var arr = this._super.apply(this, arguments); - return arr.concat('channel_archive'); - }, +chat_manager.get_properties = function (msg) { + var properties = chat_manager_super.get_properties.apply(this, arguments); + properties.is_archive = this.property_descr("channel_archive", msg, this); + return properties; +}; - get_domain: function(channel){ - return (channel.id === "channel_archive") ? [ - '|', ['partner_ids', 'in', [openerp.session.partner_id]], - ['author_id.user_ids', 'in', [openerp.session.uid]] - ] : this._super.apply(this, arguments); +chat_manager.set_channel_flags = function (data, msg) { + chat_manager_super.set_channel_flags.apply(this, arguments); + // Get recipients ids + var recipients_ids = []; + for (var i = 0; i < (data.partner_ids || []).length; i++){ + recipients_ids.push(data.partner_ids[i][0]); } -}); -base_obj.chat_manager.is_ready.then(function(){ - // Add archive channel - base_obj.chat_manager.mail_tools.add_channel({ - id: "channel_archive", - name: _lt("Archive"), - type: "static" - }); + // If author or recipient + if (data.author_id[0] === session.partner_id || recipients_ids.indexOf(session.partner_id) !== -1) { + msg.is_archive = true; + } + + return msg; +}; + +chat_manager.get_channel_array = function (msg) { + var arr = chat_manager_super.get_channel_array.apply(this, arguments); + return arr.concat('channel_archive'); +}; - return $.when(); +chat_manager.get_domain = function (channel) { + return (channel.id === "channel_archive") + ? ['|', ['partner_ids', 'in', [session.partner_id]], + ['author_id', 'in', [session.partner_id]]] + : chat_manager_super.get_domain.apply(this, arguments); +}; + +chat_manager.is_ready.then(function () { + chat_manager.add_channel({ + id: "channel_archive", + name: _lt("Archive"), + type: "static" }); +}); + -return base_obj.chat_manager; +return chat_manager; }); diff --git a/mail_archives/static/src/xml/menu.xml b/mail_archives/static/src/xml/menu.xml index 30e39e2..f446be3 100644 --- a/mail_archives/static/src/xml/menu.xml +++ b/mail_archives/static/src/xml/menu.xml @@ -3,7 +3,7 @@ -
+
Archive
diff --git a/mail_archives/tests/__init__.py b/mail_archives/tests/__init__.py index cadc614..a43ec20 100644 --- a/mail_archives/tests/__init__.py +++ b/mail_archives/tests/__init__.py @@ -1,3 +1,2 @@ -# -*- coding: utf-8 -*- from . import test_js diff --git a/mail_archives/tests/test_js.py b/mail_archives/tests/test_js.py index ecb0384..e8f9457 100644 --- a/mail_archives/tests/test_js.py +++ b/mail_archives/tests/test_js.py @@ -1,4 +1,3 @@ -# -*- coding: utf-8 -*- import odoo.tests diff --git a/mail_archives/views/templates.xml b/mail_archives/views/templates.xml index 147f1a0..f1102bd 100644 --- a/mail_archives/views/templates.xml +++ b/mail_archives/views/templates.xml @@ -5,6 +5,7 @@ name="res_partner_mails_count_assets_backend" inherit_id="web.assets_backend"> + diff --git a/mail_attachment_popup/README.rst b/mail_attachment_popup/README.rst deleted file mode 100644 index 927cd02..0000000 --- a/mail_attachment_popup/README.rst +++ /dev/null @@ -1,35 +0,0 @@ -=================== - Popup Attachments -=================== - - The module opens attached mail images in popup. - -Credits -======= - -Contributors ------------- -* Dinar Gabbasov - -Sponsors --------- -* `IT-Projects LLC `__ - -Maintainers ------------ -* `IT-Projects LLC `__ - - The module is not maintained in future versions because it's functionality built-in since Odoo 11.0. - -Further information -=================== - -Demo: http://runbot.it-projects.info/demo/mail-addons/10.0 - -HTML Description: https://apps.odoo.com/apps/modules/10.0/mail_attachment_popup/ - -Usage instructions: ``_ - -Changelog: ``_ - -Tested on Odoo 10.0 9cf666288076dc4e315e62e7ca0d6fc59995a498 diff --git a/mail_attachment_popup/__init__.py b/mail_attachment_popup/__init__.py deleted file mode 100644 index e69de29..0000000 diff --git a/mail_attachment_popup/__manifest__.py b/mail_attachment_popup/__manifest__.py deleted file mode 100644 index 52d7491..0000000 --- a/mail_attachment_popup/__manifest__.py +++ /dev/null @@ -1,29 +0,0 @@ -# -*- coding: utf-8 -*- -{ - "name": """Popup Attachments""", - "summary": """Open attached mail images in popup""", - "category": "Extra Tools", - "version": "10.0.1.0.0", - "images": ['images/popup_image.png'], - - "author": "IT-Projects LLC, Dinar Gabbasov", - "support": "apps@it-projects.info", - 'website': "https://twitter.com/gabbasov_dinar", - "license": "GPL-3", - "price": "50.0", - "currency": "EUR", - - "depends": [ - "mail", - ], - "external_dependencies": {"python": [], "bin": []}, - "data": [ - "views/mail_attachment_popup_template.xml", - ], - "qweb": [ - "static/src/xml/mail_attachment_popup.xml", - ], - - "installable": True, - 'auto_install': False, -} diff --git a/mail_attachment_popup/doc/index.rst b/mail_attachment_popup/doc/index.rst deleted file mode 100644 index 70b614f..0000000 --- a/mail_attachment_popup/doc/index.rst +++ /dev/null @@ -1,16 +0,0 @@ -=================== - Popup Attachments -=================== - -Installation -============ - -* `Install `__ this module in a usual way - -Usage -===== - -* Open 'Messaging' menu -* Find any message with image in attachments -* Click on the image -* Browser opens image in popup instead of downloading it diff --git a/mail_attachment_popup/i18n/de.po b/mail_attachment_popup/i18n/de.po deleted file mode 100644 index 1cd965d..0000000 --- a/mail_attachment_popup/i18n/de.po +++ /dev/null @@ -1,28 +0,0 @@ -# Translation of Odoo Server. -# This file contains the translation of the following modules: -# * mail_attachment_popup -# -# Translators: -# Dawid Runowski , 2019 -# -msgid "" -msgstr "" -"Project-Id-Version: Odoo Server 10.0\n" -"Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2018-05-05 23:11+0000\n" -"PO-Revision-Date: 2017-06-23 14:31+0000\n" -"Last-Translator: Dawid Runowski , 2019\n" -"Language-Team: German (https://www.transifex.com/it-projects-llc/teams/76080/" -"de/)\n" -"Language: de\n" -"MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=UTF-8\n" -"Content-Transfer-Encoding: \n" -"Plural-Forms: nplurals=2; plural=(n != 1);\n" - -#. module: mail_attachment_popup -#. openerp-web -#: code:addons/mail_attachment_popup/static/src/xml/mail_attachment_popup.xml:17 -#, python-format -msgid "Download" -msgstr "Herunterladen" diff --git a/mail_attachment_popup/i18n/es.po b/mail_attachment_popup/i18n/es.po deleted file mode 100644 index 707cd8c..0000000 --- a/mail_attachment_popup/i18n/es.po +++ /dev/null @@ -1,27 +0,0 @@ -# Translation of Odoo Server. -# This file contains the translation of the following modules: -# * mail_attachment_popup -# -# Translators: -# Randall Castro , 2018 -msgid "" -msgstr "" -"Project-Id-Version: Odoo Server 10.0\n" -"Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2017-12-19 16:49+0000\n" -"PO-Revision-Date: 2017-12-19 16:49+0000\n" -"Last-Translator: Randall Castro , 2018\n" -"Language-Team: Spanish (https://www.transifex.com/it-projects-llc/" -"teams/76080/es/)\n" -"Language: es\n" -"MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=UTF-8\n" -"Content-Transfer-Encoding: \n" -"Plural-Forms: nplurals=2; plural=(n != 1);\n" - -#. module: mail_attachment_popup -#. openerp-web -#: code:addons/mail_attachment_popup/static/src/xml/mail_attachment_popup.xml:17 -#, python-format -msgid "Download" -msgstr "Descargar" diff --git a/mail_attachment_popup/i18n/mail_attachment_popup.pot b/mail_attachment_popup/i18n/mail_attachment_popup.pot deleted file mode 100644 index 5e3a6cf..0000000 --- a/mail_attachment_popup/i18n/mail_attachment_popup.pot +++ /dev/null @@ -1,22 +0,0 @@ -# Translation of Odoo Server. -# This file contains the translation of the following modules: -# * mail_attachment_popup -# -msgid "" -msgstr "" -"Project-Id-Version: Odoo Server 10.0\n" -"Report-Msgid-Bugs-To: \n" -"Last-Translator: <>\n" -"Language-Team: \n" -"MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=UTF-8\n" -"Content-Transfer-Encoding: \n" -"Plural-Forms: \n" - -#. module: mail_attachment_popup -#. openerp-web -#: code:addons/mail_attachment_popup/static/src/xml/mail_attachment_popup.xml:17 -#, python-format -msgid "Download" -msgstr "" - diff --git a/mail_attachment_popup/i18n/ru.po b/mail_attachment_popup/i18n/ru.po deleted file mode 100644 index ab67177..0000000 --- a/mail_attachment_popup/i18n/ru.po +++ /dev/null @@ -1,29 +0,0 @@ -# Translation of Odoo Server. -# This file contains the translation of the following modules: -# * mail_attachment_popup -# -# Translators: -# Dinar , 2017 -msgid "" -msgstr "" -"Project-Id-Version: Odoo Server 10.0\n" -"Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2017-11-16 08:35+0000\n" -"PO-Revision-Date: 2017-11-16 08:35+0000\n" -"Last-Translator: Dinar , 2017\n" -"Language-Team: Russian (https://www.transifex.com/it-projects-llc/" -"teams/76080/ru/)\n" -"Language: ru\n" -"MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=UTF-8\n" -"Content-Transfer-Encoding: \n" -"Plural-Forms: nplurals=4; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n" -"%10<=4 && (n%100<12 || n%100>14) ? 1 : n%10==0 || (n%10>=5 && n%10<=9) || (n" -"%100>=11 && n%100<=14)? 2 : 3);\n" - -#. module: mail_attachment_popup -#. openerp-web -#: code:addons/mail_attachment_popup/static/src/xml/mail_attachment_popup.xml:17 -#, python-format -msgid "Download" -msgstr "Скачать" diff --git a/mail_attachment_popup/images/popup_image.png b/mail_attachment_popup/images/popup_image.png deleted file mode 100644 index 97af8e9..0000000 Binary files a/mail_attachment_popup/images/popup_image.png and /dev/null differ diff --git a/mail_attachment_popup/static/description/attach_image.png b/mail_attachment_popup/static/description/attach_image.png deleted file mode 100644 index c403348..0000000 Binary files a/mail_attachment_popup/static/description/attach_image.png and /dev/null differ diff --git a/mail_attachment_popup/static/description/download.png b/mail_attachment_popup/static/description/download.png deleted file mode 100644 index 9ad68ef..0000000 Binary files a/mail_attachment_popup/static/description/download.png and /dev/null differ diff --git a/mail_attachment_popup/static/description/index.html b/mail_attachment_popup/static/description/index.html deleted file mode 100644 index 18703d1..0000000 --- a/mail_attachment_popup/static/description/index.html +++ /dev/null @@ -1,84 +0,0 @@ -
-
-
-

Popup Attachments

-

Open attachments in popup

-
-
-
- -
-
-
-

- The module allows to open attachments (images) in popup. It is convenient if you want to display them only without downloading. -

-
-
-
- -
-
-
-

How it works

-
-
-
- -
-
-
-

- Go to "Messaging" menu and open email that contains image(s) in attachment. -

-
-
-
- -
-
-
-
- -
-
-
-
- -
-
-
-

- Click on the image and see how popup is appear. -

-
-
-
- -
-
-
-

- Moreover, you can download it to your device by clicking on the "Download" button if needed. -

-
-
-
- -
-
-
-
- -
-
-
-

Need our service?

-

Contact us by email or fill out request form

- -
-
-
diff --git a/mail_attachment_popup/static/description/popup.png b/mail_attachment_popup/static/description/popup.png deleted file mode 100644 index 674baf7..0000000 Binary files a/mail_attachment_popup/static/description/popup.png and /dev/null differ diff --git a/mail_attachment_popup/static/lib/js/jquery.arcticmodal.js b/mail_attachment_popup/static/lib/js/jquery.arcticmodal.js deleted file mode 100644 index 0db47e2..0000000 --- a/mail_attachment_popup/static/lib/js/jquery.arcticmodal.js +++ /dev/null @@ -1,429 +0,0 @@ -/* - - arcticModal — jQuery plugin - Version: 0.3 - Author: Sergey Predvoditelev (sergey.predvoditelev@gmail.com) - Company: Arctic Laboratory (http://arcticlab.ru/) - - Docs & Examples: http://arcticlab.ru/arcticmodal/ - - */ -(function($) { - - - var default_options = { - - type: 'html', // ajax или html - content: '', - url: '', - ajax: {}, - ajax_request: null, - - closeOnEsc: true, - closeOnOverlayClick: true, - - clone: false, - - overlay: { - block: undefined, - tpl: '
', - css: { - backgroundColor: '#000', - opacity: .6 - } - }, - - container: { - block: undefined, - tpl: '
' - }, - - wrap: undefined, - body: undefined, - - errors: { - tpl: '
', - autoclose_delay: 2000, - ajax_unsuccessful_load: 'Error' - }, - - openEffect: { - type: 'fade', - speed: 400 - }, - closeEffect: { - type: 'fade', - speed: 400 - }, - - beforeOpen: $.noop, - afterOpen: $.noop, - beforeClose: $.noop, - afterClose: $.noop, - afterLoading: $.noop, - afterLoadingOnShow: $.noop, - errorLoading: $.noop - - }; - - - var modalID = 0; - var modals = $([]); - - - var utils = { - - - // Определяет произошло ли событие e вне блока block - isEventOut: function(blocks, e) { - var r = true; - $(blocks).each(function() { - if ($(e.target).get(0)==$(this).get(0)) r = false; - if ($(e.target).closest('HTML', $(this).get(0)).length==0) r = false; - }); - return r; - } - - - }; - - - var modal = { - - - // Возвращает элемент, которым был вызван плагин - getParentEl: function(el) { - var r = $(el); - if (r.data('arcticmodal')) return r; - r = $(el).closest('.arcticmodal-container').data('arcticmodalParentEl'); - if (r) return r; - return false; - }, - - - // Переход - transition: function(el, action, options, callback) { - callback = callback==undefined ? $.noop : callback; - switch (options.type) { - case 'fade': - action=='show' ? el.fadeIn(options.speed, callback) : el.fadeOut(options.speed, callback); - break; - case 'none': - action=='show' ? el.show() : el.hide(); - callback(); - break; - } - }, - - - // Подготвка содержимого окна - prepare_body: function(D, $this) { - - // Обработчик закрытия - $('.arcticmodal-close', D.body).unbind('click.arcticmodal').bind('click.arcticmodal', function() { - $this.arcticmodal('close'); - return false; - }); - - }, - - - // Инициализация элемента - init_el: function($this, options) { - var D = $this.data('arcticmodal'); - if (D) return; - - D = options; - modalID++; - D.modalID = modalID; - - // Overlay - D.overlay.block = $(D.overlay.tpl); - D.overlay.block.css(D.overlay.css); - - // Container - D.container.block = $(D.container.tpl); - - // BODY - D.body = $('.arcticmodal-container_i2', D.container.block); - if (options.clone) { - D.body.html($this.clone(true)); - } else { - $this.before('