diff --git a/addons/sms/models/sms_template.py b/addons/sms/models/sms_template.py index f3e777f77c4..be402f02a37 100644 --- a/addons/sms/models/sms_template.py +++ b/addons/sms/models/sms_template.py @@ -50,7 +50,7 @@ class SMSTemplate(models.Model): 'type': 'ir.actions.act_window', 'res_model': 'sms.composer', # Add default_composition_mode to guess to determine if need to use mass or comment composer - 'context': "{'default_template_id' : %d, 'default_composition_mode': 'guess', 'default_res_ids': active_ids, 'default_res_id': active_id}" % (template.id), + 'context': "{'default_template_id' : %d, 'sms_composition_mode': 'guess', 'default_res_ids': active_ids, 'default_res_id': active_id}" % (template.id), 'view_mode': 'form', 'view_id': view.id, 'target': 'new', diff --git a/addons/sms/wizard/sms_composer.py b/addons/sms/wizard/sms_composer.py index 7467d99a21a..044ce248ce1 100644 --- a/addons/sms/wizard/sms_composer.py +++ b/addons/sms/wizard/sms_composer.py @@ -74,10 +74,10 @@ class SendSMS(models.TransientModel): readonly=False, store=True, required=True) @api.depends('res_ids_count', 'active_domain_count') - @api.depends_context('default_composition_mode') + @api.depends_context('sms_composition_mode') def _compute_composition_mode(self): for composer in self: - if self.env.context.get('default_composition_mode') == 'guess' or not composer.composition_mode: + if self.env.context.get('sms_composition_mode') == 'guess' or not composer.composition_mode: if composer.res_ids_count > 1 or (composer.use_active_domain and composer.active_domain_count > 1): composer.composition_mode = 'mass' else: diff --git a/addons/test_mail_full/tests/test_sms_composer.py b/addons/test_mail_full/tests/test_sms_composer.py index cee5e969c1a..8a36d0ce2e5 100644 --- a/addons/test_mail_full/tests/test_sms_composer.py +++ b/addons/test_mail_full/tests/test_sms_composer.py @@ -519,7 +519,7 @@ class TestSMSComposerMass(TestMailFullCommon): # Composer creation with context from a template context action (simulate) - comment (single recipient) with self.with_user('employee'): composer = self.env['sms.composer'].with_context( - default_composition_mode='guess', + sms_composition_mode='guess', default_res_ids=[test_record_2.id], default_res_id=test_record_2.id, active_ids=[test_record_2.id], @@ -541,7 +541,7 @@ class TestSMSComposerMass(TestMailFullCommon): # Composer creation with context from a template context action (simulate) - mass (multiple recipient) with self.with_user('employee'): composer = self.env['sms.composer'].with_context( - default_composition_mode='guess', + sms_composition_mode='guess', default_res_ids=[test_record_1.id, test_record_2.id], default_res_id=test_record_1.id, active_ids=[test_record_1.id, test_record_2.id],