From 20435618587ed0427d814a96d71d0567c7cf8647 Mon Sep 17 00:00:00 2001 From: Ivan Yelizariev Date: Sat, 16 Feb 2019 13:17:48 -0500 Subject: [PATCH] :green_heart: --- mail_base/__manifest__.py | 2 +- mail_move_message/__manifest__.py | 2 +- mail_move_message/doc/index.rst | 4 ++++ mail_move_message/mail_move_message_models.py | 13 ++++--------- 4 files changed, 10 insertions(+), 11 deletions(-) create mode 100644 mail_move_message/doc/index.rst diff --git a/mail_base/__manifest__.py b/mail_base/__manifest__.py index 3ce27de..adf46b6 100644 --- a/mail_base/__manifest__.py +++ b/mail_base/__manifest__.py @@ -4,7 +4,7 @@ "summary": """Makes Mail extendable""", "category": "Discuss", "images": [], - "version": "1.0.5", + "version": "10.0.1.0.5", "author": "IT-Projects LLC, Pavel Romanchenko", "support": "apps@it-projects.info", diff --git a/mail_move_message/__manifest__.py b/mail_move_message/__manifest__.py index 103e46b..1403ecb 100644 --- a/mail_move_message/__manifest__.py +++ b/mail_move_message/__manifest__.py @@ -1,7 +1,7 @@ # -*- coding: utf-8 -*- { 'name': 'Mail relocation', - 'version': '1.0.6', + 'version': '10.0.1.0.6', 'author': 'IT-Projects LLC, Ivan Yelizariev, Pavel Romanchenko', 'license': 'LGPL-3', 'category': 'Discuss', diff --git a/mail_move_message/doc/index.rst b/mail_move_message/doc/index.rst new file mode 100644 index 0000000..9249be6 --- /dev/null +++ b/mail_move_message/doc/index.rst @@ -0,0 +1,4 @@ +================= + Mail relocation +================= + diff --git a/mail_move_message/mail_move_message_models.py b/mail_move_message/mail_move_message_models.py index 6732e83..3cdbd11 100644 --- a/mail_move_message/mail_move_message_models.py +++ b/mail_move_message/mail_move_message_models.py @@ -71,7 +71,7 @@ class Wizard(models.TransientModel): parent_id = fields.Many2one('mail.message', string='Search by name', ) model = fields.Selection(_model_selection, string='Model') res_id = fields.Integer(string='Record') - can_move = fields.Boolean('Can move', compute='get_can_move') + can_move = fields.Boolean('Can move', compute='_compute_can_move') move_back = fields.Boolean('MOVE TO ORIGIN', help='Move message and submessages to original place') partner_id = fields.Many2one('res.partner', string='Author') filter_by_partner = fields.Boolean('Filter Records by partner') @@ -88,15 +88,10 @@ class Wizard(models.TransientModel): @api.depends('message_id') @api.multi - def get_can_move(self): + def _compute_can_move(self): for r in self: - r.get_can_move_one() - - @api.multi - def get_can_move_one(self): - self.ensure_one() - # message was not moved before OR message is a top message of previous move - self.can_move = not self.message_id.moved_by_message_id or self.message_id.moved_by_message_id.id == self.message_id.id + # message was not moved before OR message is a top message of previous move + r.can_move = not r.message_id.moved_by_message_id or r.message_id.moved_by_message_id.id == r.message_id.id @api.onchange('move_back') def on_change_move_back(self):