Browse Source

Merge pull request #272 from trojikman/12.0-pre-commit-cleanup

commit is created by 👷‍♂️ Merge Bot: https://odoo-devops.readthedocs.io/en/latest/git/github-merge-bot.html
pull/276/head
Mitchell Admin 5 years ago
committed by GitHub
parent
commit
398dc9ceee
No known key found for this signature in database GPG Key ID: 4AEE18F83AFDEB23
  1. 1
      mail_all/static/src/js/mail_all.js
  2. 1
      mail_archives/static/src/js/archives.js
  3. 2
      mail_base/__manifest__.py
  4. 4
      mail_base/models.py
  5. 1
      mail_fix_553/__manifest__.py
  6. 5
      mail_fix_553/mail_fix_553.py
  7. 2
      mail_move_message/__manifest__.py
  8. 30
      mail_move_message/static/src/js/mail_move_message.js
  9. 2
      mail_private/static/src/js/mail_private.js
  10. 1
      mail_sent/static/src/js/sent.js
  11. 2
      mailgun/__manifest__.py

1
mail_all/static/src/js/mail_all.js

@ -13,7 +13,6 @@ odoo.define("mail_all.all", function(require) {
Manager.include({ Manager.include({
_updateMailboxesFromServer: function(data) { _updateMailboxesFromServer: function(data) {
var self = this;
this._super(data); this._super(data);
if ( if (
!_.find(this.getThreads(), function(th) { !_.find(this.getThreads(), function(th) {

1
mail_archives/static/src/js/archives.js

@ -11,7 +11,6 @@ odoo.define("mail_archives.archives", function(require) {
Manager.include({ Manager.include({
_updateMailboxesFromServer: function(data) { _updateMailboxesFromServer: function(data) {
var self = this;
this._super(data); this._super(data);
if ( if (
!_.find(this.getThreads(), function(th) { !_.find(this.getThreads(), function(th) {

2
mail_base/__manifest__.py

@ -3,7 +3,7 @@
"summary": """Makes Mail extendable""", "summary": """Makes Mail extendable""",
"category": "Discuss", "category": "Discuss",
"images": [], "images": [],
"version": "11.0.1.0.2",
"version": "12.0.1.0.2",
"author": "IT-Projects LLC, Pavel Romanchenko", "author": "IT-Projects LLC, Pavel Romanchenko",
"support": "apps@itpp.dev", "support": "apps@itpp.dev",
"website": "https://it-projects.info", "website": "https://it-projects.info",

4
mail_base/models.py

@ -11,8 +11,8 @@ class MailMessage(models.Model):
values["partner_ids"] = [] values["partner_ids"] = []
for triplet in values.get("needaction_partner_ids"): for triplet in values.get("needaction_partner_ids"):
if triplet[0] == 6: if triplet[0] == 6:
for id in triplet[2]:
values["partner_ids"].append((4, id, False))
for i in triplet[2]:
values["partner_ids"].append((4, i, False))
return super(MailMessage, self).write(values) return super(MailMessage, self).write(values)

1
mail_fix_553/__manifest__.py

@ -1,3 +1,4 @@
# pylint: disable=manifest-version-format
{ {
"name": "Fix mail error 553", "name": "Fix mail error 553",
"version": "0.3", "version": "0.3",

5
mail_fix_553/mail_fix_553.py

@ -1,3 +1,4 @@
# pylint: disable=old-api7-method-defined,invalid-commit
import base64 import base64
import logging import logging
import re import re
@ -5,7 +6,7 @@ from email.utils import formataddr
from odoo import SUPERUSER_ID, tools from odoo import SUPERUSER_ID, tools
from odoo.osv import osv from odoo.osv import osv
from odoo.tools.safe_eval import safe_eval as eval
from odoo.tools.safe_eval import safe_eval
from odoo.tools.translate import _ from odoo.tools.translate import _
from odoo.addons.base.ir.ir_mail_server import MailDeliveryException from odoo.addons.base.ir.ir_mail_server import MailDeliveryException
@ -115,7 +116,7 @@ class MailMail(osv.Model):
) )
if mail.headers: if mail.headers:
try: try:
headers.update(eval(mail.headers))
headers.update(safe_eval(mail.headers))
except Exception: except Exception:
pass pass

2
mail_move_message/__manifest__.py

@ -7,7 +7,7 @@
{ {
"name": "Mail Relocation", "name": "Mail Relocation",
"version": "11.0.1.0.6",
"version": "12.0.1.0.6",
"author": "IT-Projects LLC, Ivan Yelizariev, Pavel Romanchenko", "author": "IT-Projects LLC, Ivan Yelizariev, Pavel Romanchenko",
"license": "Other OSI approved licence", # MIT "license": "Other OSI approved licence", # MIT
"category": "Discuss", "category": "Discuss",

30
mail_move_message/static/src/js/mail_move_message.js

@ -1,3 +1,5 @@
/* eslint no-unused-vars: "off"*/
/* Copyright 2016 Ildar Nasyrov <https://it-projects.info/team/iledarn> /* Copyright 2016 Ildar Nasyrov <https://it-projects.info/team/iledarn>
# Copyright 2016 Ivan Yelizariev <https://it-projects.info/team/yelizariev> # Copyright 2016 Ivan Yelizariev <https://it-projects.info/team/yelizariev>
# Copyright 2016 Pavel Romanchenko # Copyright 2016 Pavel Romanchenko
@ -7,25 +9,13 @@
odoo.define("mail_move_message.relocate", function(require) { odoo.define("mail_move_message.relocate", function(require) {
"use strict"; "use strict";
var bus = require("bus.bus").bus;
var chat_manager = require("mail_base.base").chat_manager; var chat_manager = require("mail_base.base").chat_manager;
var thread = require("mail.ChatThread"); var thread = require("mail.ChatThread");
var chatter = require("mail.Chatter"); var chatter = require("mail.Chatter");
var rpc = require("web.rpc");
var Basicmodel = require("web.BasicModel"); var Basicmodel = require("web.BasicModel");
var view_dialogs = require("web.view_dialogs");
var field_utils_format = require("web.field_utils").format;
var BasicRenderer = require("web.BasicRenderer");
var core = require("web.core"); var core = require("web.core");
var form_widget = require("web.FormRenderer");
var session = require("web.Session");
var FormController = require("web.FormController"); var FormController = require("web.FormController");
var FormView = require("web.FormView");
var FormRenderer = require("web.FormRenderer");
var dialogs = require("web.view_dialogs");
var Dialog = require("web.Dialog");
var relational_fields = require("web.relational_fields"); var relational_fields = require("web.relational_fields");
var Widget = require("web.Widget");
var _t = core._t; var _t = core._t;
@ -50,7 +40,9 @@ odoo.define("mail_move_message.relocate", function(require) {
context: {default_message_id: message_id}, context: {default_message_id: message_id},
}; };
this.do_action(action, { this.do_action(action, {
on_close: function() {},
on_close: function() {
// Empty
},
}); });
}, },
}); });
@ -60,10 +52,12 @@ odoo.define("mail_move_message.relocate", function(require) {
var result = this._super.apply(this, arguments); var result = this._super.apply(this, arguments);
// For show wizard in the form // For show wizard in the form
if (this.fields.thread && this.fields.thread.thread) { if (this.fields.thread && this.fields.thread.thread) {
var thread = this.fields.thread.thread;
thread = this.fields.thread.thread;
thread.on("move_message", this, thread.on_move_message); thread.on("move_message", this, thread.on_move_message);
} }
return $.when(result).done(function() {});
return $.when(result).done(function() {
// Empty
});
}, },
}); });
@ -73,7 +67,9 @@ odoo.define("mail_move_message.relocate", function(require) {
var result = this._super.apply(this, arguments); var result = this._super.apply(this, arguments);
// For show wizard in the channels // For show wizard in the channels
this.thread.on("move_message", this, this.thread.on_move_message); this.thread.on("move_message", this, this.thread.on_move_message);
return $.when(result).done(function() {});
return $.when(result).done(function() {
// Empty
});
}, },
}); });
@ -127,6 +123,7 @@ odoo.define("mail_move_message.relocate", function(require) {
) { ) {
var self = this; var self = this;
var field_data = event.data.record.data; var field_data = event.data.record.data;
// TODO: it seems like debugging, test without this code
this.on_saved = function(record, bool) { this.on_saved = function(record, bool) {
var values = [ var values = [
{ {
@ -149,6 +146,7 @@ odoo.define("mail_move_message.relocate", function(require) {
// Necessary for correct _trigger_up implementation in mixins.js // Necessary for correct _trigger_up implementation in mixins.js
return self; return self;
}; };
// TODO: it seems like debugging, test without this code
var wizard_popup = relField._searchCreatePopup("form", false, { var wizard_popup = relField._searchCreatePopup("form", false, {
message_name_from: message_name_from:
field_data.message_name_from && field_data.message_name_from &&

2
mail_private/static/src/js/mail_private.js

@ -7,13 +7,11 @@
odoo.define("mail_private", function(require) { odoo.define("mail_private", function(require) {
"use strict"; "use strict";
var core = require("web.core");
var Chatter = require("mail.Chatter"); var Chatter = require("mail.Chatter");
var ChatterComposer = require("mail.composer.Chatter"); var ChatterComposer = require("mail.composer.Chatter");
var session = require("web.session"); var session = require("web.session");
var rpc = require("web.rpc"); var rpc = require("web.rpc");
var config = require("web.config");
var mailUtils = require("mail.utils"); var mailUtils = require("mail.utils");
Chatter.include({ Chatter.include({

1
mail_sent/static/src/js/sent.js

@ -14,7 +14,6 @@ odoo.define("mail_sent.sent", function(require) {
Manager.include({ Manager.include({
_updateMailboxesFromServer: function(data) { _updateMailboxesFromServer: function(data) {
var self = this;
this._super(data); this._super(data);
if ( if (
!_.find(this.getThreads(), function(th) { !_.find(this.getThreads(), function(th) {

2
mailgun/__manifest__.py

@ -6,7 +6,7 @@
"category": "Discuss", "category": "Discuss",
# "live_test_url": "http://apps.it-projects.info/shop/product/mailgun?version=11.0", # "live_test_url": "http://apps.it-projects.info/shop/product/mailgun?version=11.0",
"images": ["images/mailgun_main.png"], "images": ["images/mailgun_main.png"],
"version": "11.0.1.1.0",
"version": "12.0.1.1.0",
"application": False, "application": False,
"author": "IT-Projects LLC, Ildar Nasyrov", "author": "IT-Projects LLC, Ildar Nasyrov",
"support": "apps@itpp.dev", "support": "apps@itpp.dev",

Loading…
Cancel
Save