diff options
| author | David Rousselie <dax@happycoders.org> | 2009-02-16 22:05:24 +0300 |
|---|---|---|
| committer | David Rousselie <dax@happycoders.org> | 2009-02-16 22:05:24 +0300 |
| commit | 5e226f2a976774fc8ab260d915c38d099546c6b8 (patch) | |
| tree | 20b3bb48aac98f5fa17d29d3a971a1973a95d987 /src | |
| parent | 055bdf342486b97a8b456bbe34dc49258995cfee (diff) | |
Force Account's user column name (SQLObject bug?)
Ignore-this: e344b0463c4572db8c0bc032c3bee2d0
darcs-hash:20090216190524-86b55-5ab4f8393628c368b2f9f271808fea99b2ec2a2b.gz
Diffstat (limited to 'src')
| -rw-r--r-- | src/jcl/jabber/tests/command.py | 1 | ||||
| -rw-r--r-- | src/jcl/model/account.py | 4 |
2 files changed, 2 insertions, 3 deletions
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 = "") |