david/jcl
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Force Account's user column name (SQLObject bug?)

Browse Source 
Ignore-this: e344b0463c4572db8c0bc032c3bee2d0

darcs-hash:20090216190524-86b55-5ab4f8393628c368b2f9f271808fea99b2ec2a2b.gz
This commit is contained in:
David Rousselie
2009-02-16 20:05:24 +01:00
parent 055bdf3424
commit 5e226f2a97
2 changed files with 2 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/jcl/jabber/tests/command.py
View File

@@ -1062,7 +1062,6 @@ class JCLCommandManagerAddUserCommand_TestCase(JCLCommandManagerTestCase):
other_session_id = self.check_step_1(result, "admin@test.com", other_session_id = self.check_step_1(result, "admin@test.com",
is_admin=True) is_admin=True)
self.assertEquals(other_session_id, session_id) self.assertEquals(other_session_id, session_id)
def test_execute_add_user_cancel(self): def test_execute_add_user_cancel(self):
""" """
Test cancel 'add-user' ad-hoc command . Test cancel 'add-user' ad-hoc command .

4
src/jcl/model/account.py
View File

@@ -60,7 +60,7 @@ def mandatory_field(field_name, field_value):
if field_value is None or str(field_value) == "": if field_value is None or str(field_value) == "":
raise MandatoryFieldError(field_name) raise MandatoryFieldError(field_name)
return field_value return field_value
class User(InheritableSQLObject): class User(InheritableSQLObject):
class sqlmeta: class sqlmeta:
table = "user_table" table = "user_table"
@@ -98,7 +98,7 @@ class Account(InheritableSQLObject):
legacy_jids = MultipleJoin('LegacyJID') legacy_jids = MultipleJoin('LegacyJID')
enabled = BoolCol(default=True) enabled = BoolCol(default=True)
lastlogin = DateTimeCol(default=datetime.datetime.today()) lastlogin = DateTimeCol(default=datetime.datetime.today())
user = ForeignKey("User") user = ForeignKey("User", dbName="user_table_id")
## Use these attributs to support volatile password ## Use these attributs to support volatile password
## login = StringCol(default = "") ## login = StringCol(default = "")