diff --git a/client/fasClient b/client/fasClient index d5f0bac..82c8e77 100755 --- a/client/fasClient +++ b/client/fasClient @@ -385,7 +385,8 @@ class MakeShellAccounts(BaseClient): def people_list(self, search='*'): params = {'search' : search} - self.people = self.send_request('user/list', auth=True, input=params)['people'] + data = self.send_request('user/list', auth=True, input=params) + self.people = data['people'] + data['unapproved_people'] def email_list(self, search='*'): params = {'search' : search} diff --git a/fas.cfg b/fas.cfg index 3706246..934c2b7 100644 --- a/fas.cfg +++ b/fas.cfg @@ -59,7 +59,7 @@ mail.encoding = 'utf-8' # If you have sqlite, here's a simple default to get you started # in development -sqlalchemy.dburi="postgres://fedora:test@localhost/fas2" +sqlalchemy.dburi="postgres://fedora:bunbunbun@localhost/fas2" #sqlalchemy.echo=True # if you are using a database or table type without transactions diff --git a/fas/templates/user/list.html b/fas/templates/user/list.html index d2679b7..0f49b0e 100644 --- a/fas/templates/user/list.html +++ b/fas/templates/user/list.html @@ -7,7 +7,6 @@