From 0c447c2afa3a97c5122b8edea89fe1cb337cec78 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=A9dric=20Krier?= Date: Sat, 29 Dec 2018 14:20:30 +0100 Subject: [PATCH] Add ir.message and use custom exceptions issue3672 --- message.xml | 13 +++++++++++++ tryton.cfg | 1 + user.py | 5 +++-- 3 files changed, 17 insertions(+), 2 deletions(-) create mode 100644 message.xml diff --git a/message.xml b/message.xml new file mode 100644 index 0000000000..6c6705d455 --- /dev/null +++ b/message.xml @@ -0,0 +1,13 @@ + + + + + + E-mail of active web user must be unique. + + + Web user session key must be unique. + + + diff --git a/tryton.cfg b/tryton.cfg index bc45317d2b..b8d022ea14 100644 --- a/tryton.cfg +++ b/tryton.cfg @@ -5,3 +5,4 @@ depends: party xml: user.xml + message.xml diff --git a/user.py b/user.py index 48dbe7c358..a8239882e7 100644 --- a/user.py +++ b/user.py @@ -93,7 +93,7 @@ class User(DeactivableMixin, ModelSQL, ModelView): ('email_exclude', Exclude(table, (table.email, Equal), where=table.active == True), - 'E-mail must be unique'), + 'web_user.msg_user_email_unique'), ] cls._buttons.update({ 'validate_email': { @@ -414,7 +414,8 @@ class UserSession(ModelSQL): table = cls.__table__() cls.__rpc__ = {} cls._sql_constraints += [ - ('key_unique', Unique(table, table.key), 'Key must be unique'), + ('key_unique', Unique(table, table.key), + 'web_user.msg_user_session_key_unique'), ] @classmethod