From 42cabf0d79f2be5a1d92742033b656322d2aeca4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?C=C3=A9dric=20Krier?= <ced@b2ck.com>
Date: Mon, 19 Mar 2018 16:20:15 +0100
Subject: [PATCH] Require email only for active user

This allows to re-create inactivate user.

issue7172
review40141002
---
 CHANGELOG |  1 +
 user.py   | 18 +++++++++++++++++-
 2 files changed, 18 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG b/CHANGELOG
index 1969c6bf6d..b83d63067c 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,3 +1,4 @@
+* Require email only for active user
 * Add maximum authentication attempt
 
 Version 4.6.0 - 2017-10-30
diff --git a/user.py b/user.py
index 7c7ac6eca7..2226341dea 100644
--- a/user.py
+++ b/user.py
@@ -20,6 +20,7 @@ except ImportError:
 from sql.conditionals import Coalesce
 from sql.functions import CurrentTimestamp
 
+from trytond import backend
 from trytond.config import config
 from trytond.exceptions import RateLimitException
 from trytond.model import ModelView, ModelSQL, fields, Unique
@@ -66,7 +67,11 @@ class User(ModelSQL, ModelView):
     __name__ = 'web.user'
     _rec_name = 'email'
 
-    email = fields.Char('E-mail', required=True, select=True)
+    email = fields.Char('E-mail', select=True,
+        states={
+            'required': Eval('active', True),
+            },
+        depends=['active'])
     email_valid = fields.Boolean('E-mail Valid')
     email_token = fields.Char('E-mail Token', select=True)
     password_hash = fields.Char('Password Hash')
@@ -97,6 +102,17 @@ class User(ModelSQL, ModelView):
                     },
                 })
 
+    @classmethod
+    def __register__(cls, module_name):
+        TableHandler = backend.get('TableHandler')
+
+        super(User, cls).__register__(module_name)
+
+        table_h = TableHandler(cls, module_name)
+
+        # Migration from 4.6
+        table_h.not_null_action('email', 'remove')
+
     @staticmethod
     def default_active():
         return True