diff --git a/src/jcl/jabber/tests/command.py b/src/jcl/jabber/tests/command.py index 7d7a3d5..9941961 100644 --- a/src/jcl/jabber/tests/command.py +++ b/src/jcl/jabber/tests/command.py @@ -1062,7 +1062,6 @@ class JCLCommandManagerAddUserCommand_TestCase(JCLCommandManagerTestCase): other_session_id = self.check_step_1(result, "admin@test.com", is_admin=True) self.assertEquals(other_session_id, session_id) - def test_execute_add_user_cancel(self): """ Test cancel 'add-user' ad-hoc command . diff --git a/src/jcl/model/account.py b/src/jcl/model/account.py index 99991da..7bc6998 100644 --- a/src/jcl/model/account.py +++ b/src/jcl/model/account.py @@ -60,7 +60,7 @@ def mandatory_field(field_name, field_value): if field_value is None or str(field_value) == "": raise MandatoryFieldError(field_name) return field_value - + class User(InheritableSQLObject): class sqlmeta: table = "user_table" @@ -98,7 +98,7 @@ class Account(InheritableSQLObject): legacy_jids = MultipleJoin('LegacyJID') enabled = BoolCol(default=True) lastlogin = DateTimeCol(default=datetime.datetime.today()) - user = ForeignKey("User") + user = ForeignKey("User", dbName="user_table_id") ## Use these attributs to support volatile password ## login = StringCol(default = "")