From baabfc9ecf2a5942804bf9010a5fe60aea3533bc Mon Sep 17 00:00:00 2001
From: Xavier Morel <xmo@odoo.com>
Date: Tue, 26 Nov 2019 07:58:48 +0000
Subject: [PATCH] [REM] survey: dynamic domain

Task 2115472

closes odoo/odoo#40961

Signed-off-by: Xavier Morel (xmo) <xmo@odoo.com>
---
 addons/survey/wizard/survey_invite.py        | 19 ++++++++-----------
 addons/survey/wizard/survey_invite_views.xml |  1 +
 2 files changed, 9 insertions(+), 11 deletions(-)

diff --git a/addons/survey/wizard/survey_invite.py b/addons/survey/wizard/survey_invite.py
index 52d6987efdc..7efec41e16f 100644
--- a/addons/survey/wizard/survey_invite.py
+++ b/addons/survey/wizard/survey_invite.py
@@ -43,7 +43,13 @@ class SurveyInvite(models.TransientModel):
         help="Author of the message.")
     # recipients
     partner_ids = fields.Many2many(
-        'res.partner', 'survey_invite_partner_ids', 'invite_id', 'partner_id', string='Recipients')
+        'res.partner', 'survey_invite_partner_ids', 'invite_id', 'partner_id', string='Recipients',
+        domain="""[
+            '|', (survey_users_can_signup, '=', 1),
+            '|', (not survey_users_login_required, '=', 1),
+                 ('user_ids', '!=', False),
+        ]"""
+    )
     existing_partner_ids = fields.Many2many(
         'res.partner', compute='_compute_existing_partner_ids', readonly=True, store=False)
     emails = fields.Text(string='Additional emails', help="This list of emails of recipients will not be converted in contacts.\
@@ -62,6 +68,7 @@ class SurveyInvite(models.TransientModel):
     survey_url = fields.Char(related="survey_id.public_url", readonly=True)
     survey_access_mode = fields.Selection(related="survey_id.access_mode", readonly=True)
     survey_users_login_required = fields.Boolean(related="survey_id.users_login_required", readonly=True)
+    survey_users_can_signup = fields.Boolean(related='survey_id.users_can_signup')
     deadline = fields.Datetime(string="Answer deadline")
 
     @api.depends('partner_ids', 'survey_id')
@@ -110,16 +117,6 @@ class SurveyInvite(models.TransientModel):
             raise UserError(_("Some emails you just entered are incorrect: %s") % (', '.join(error)))
         self.emails = '\n'.join(valid)
 
-    @api.onchange('survey_users_login_required')
-    def _onchange_survey_users_login_required(self):
-        if self.survey_users_login_required and not self.survey_id.users_can_signup:
-            return {'domain': {
-                    'partner_ids': [('user_ids', '!=', False)]
-                    }}
-        return {'domain': {
-                'partner_ids': []
-                }}
-
     @api.onchange('partner_ids')
     def _onchange_partner_ids(self):
         if self.survey_users_login_required and self.partner_ids:
diff --git a/addons/survey/wizard/survey_invite_views.xml b/addons/survey/wizard/survey_invite_views.xml
index d891fff0fbf..ec53e189524 100644
--- a/addons/survey/wizard/survey_invite_views.xml
+++ b/addons/survey/wizard/survey_invite_views.xml
@@ -10,6 +10,7 @@
                         <group col="2">
                             <field name="survey_access_mode" invisible="1"/>
                             <field name="survey_users_login_required" invisible="1"/>
+                            <field name="survey_users_can_signup" invisible="1"/>
                             <field name="survey_id" readonly="context.get('default_survey_id')"/>
                             <field name="existing_mode" widget="radio" invisible="1" />
                             <field name="survey_url" label="Public share URL" readonly="1" widget="CopyClipboardChar"