Brad Anderson wrote:
> Yes, I think I found that one, too, recently. It should be a part of the
> patch on #2456. Feel free to upload a patch with this reflected in it.
Just did! Attached to this email is my patch to dbauth/userdir.py
Regards,
Peter
--~--~---------~--~----~------------~-------~--~----~
You received this message because you are subscribed to the Google Groups "Trac
Development" group.
To post to this group, send email to [email protected]
To unsubscribe from this group, send email to [EMAIL PROTECTED]
For more options, visit this group at
http://groups.google.com/group/trac-dev?hl=en
-~----------~----~----~----~------~----~------~--~---
Index: 0.10/dbauth/userdir.py
===================================================================
--- 0.10/dbauth/userdir.py (revision 1911)
+++ 0.10/dbauth/userdir.py (working copy)
@@ -25,26 +25,25 @@
def __init__(self):
self.envname = get_envname(self.env)
self.perms = { # should we have defaults here?
- "table":self.env.config.get('dbauth', 'perms_table'),
- "envname": self.env.config.get('dbauth','perms_envname_field'),
- "username": self.env.config.get('dbauth','perms_username_field'),
- "groupname": self.env.config.get('dbauth','perms_groupname_field')}
+ "table":self.env.config.get('dbauth', 'users_table'),
+ "username": self.env.config.get('dbauth','users_username_field'),
+ "email": self.env.config.get('dbauth','users_email_field'),
+ "name": self.env.config.get('dbauth','users_name_field')}
# IUserDirectory methods
def get_known_user_info(self, limit=None):
cnx = get_db(self.env)
cursor = cnx.cursor()
- sql = "SELECT %s " \
+ sql = "SELECT %s, %s, %s " \
"FROM %s " \
- "WHERE (%s=%%s or %s='all') " \
"ORDER BY %s" % \
- (self.perms['username'], self.perms['table'],
- self.perms['envname'], self.perms['envname'],
- self.perms['username'], )
- cursor.execute(sql, (self.envname,))
+ (self.perms['username'], self.perms['name'],
self.perms['email'], \
+ self.perms['table'], \
+ self.perms['username'])
+ cursor.execute(sql)
for username in cursor:
- yield username,'','' # FIXME: don't we have email addresses in
tables now?
+ yield username[0],username[1],username[2]
cnx.close()
def get_known_users(self, cnx=None, limit=None):
@@ -52,12 +51,10 @@
cursor = db.cursor()
sql = "SELECT %s " \
"FROM %s " \
- "WHERE (%s=%%s or %s='all') " \
"ORDER BY %s" % \
(self.perms['username'], self.perms['table'],
- self.perms['envname'], self.perms['envname'],
- self.perms['username'], )
- cursor.execute(sql, (self.envname,))
+ self.perms['username'])
+ cursor.execute(sql)
for username in cursor:
yield username[0]
