security-and-privacy/ldapcherry
security-and-privacy/ldapcherry
1
0
Fork 0
mirror of https://github.com/kakwa/ldapcherry synced 2024-11-25 02:34:31 +01:00
Code Releases Activity

adding form and better handling of search without results

Browse Source
This commit is contained in:
kakwa 2015-05-31 22:40:20 +02:00
parent 30dc907d82
commit af3326db07
1 changed files with 13 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
ldapcherry/__init__.py
View File

@ -286,7 +286,8 @@ class LdapCherry(object):
self.temp_login = self.temp_lookup.get_template('login.tmpl') self.temp_login = self.temp_lookup.get_template('login.tmpl')
self.temp_searchadmin = self.temp_lookup.get_template('searchadmin.tmpl') self.temp_searchadmin = self.temp_lookup.get_template('searchadmin.tmpl')
self.temp_searchuser = self.temp_lookup.get_template('searchuser.tmpl') self.temp_searchuser = self.temp_lookup.get_template('searchuser.tmpl')
self.temp_adduser = self.temp_lookup.get_template('adduser.tmpl')
self.temp_form = self.temp_lookup.get_template('form.tmpl')
self._init_auth(config) self._init_auth(config)
@ -418,10 +419,13 @@ class LdapCherry(object):
return self.temp_index.render() return self.temp_index.render()
@cherrypy.expose @cherrypy.expose
def searchuser(self, searchstring): def searchuser(self, searchstring=None):
""" search user page """ """ search user page """
self._check_auth(must_admin=False) self._check_auth(must_admin=False)
res = self._search(searchstring) if not searchstring is None:
res = self._search(searchstring)
else:
res = None
attrs_list = self.attributes.get_search_attributes() attrs_list = self.attributes.get_search_attributes()
return self.temp_searchuser.render(searchresult = res, attrs_list = attrs_list) return self.temp_searchuser.render(searchresult = res, attrs_list = attrs_list)
@ -429,7 +433,10 @@ class LdapCherry(object):
def searchadmin(self, searchstring=None): def searchadmin(self, searchstring=None):
""" search user page """ """ search user page """
self._check_auth(must_admin=True) self._check_auth(must_admin=True)
res = self._search(searchstring) if not searchstring is None:
res = self._search(searchstring)
else:
res = None
attrs_list = self.attributes.get_search_attributes() attrs_list = self.attributes.get_search_attributes()
return self.temp_searchadmin.render(searchresult = res, attrs_list = attrs_list) return self.temp_searchadmin.render(searchresult = res, attrs_list = attrs_list)
@ -437,7 +444,8 @@ class LdapCherry(object):
def adduser(self, **params): def adduser(self, **params):
""" add user page """ """ add user page """
self._check_auth(must_admin=True) self._check_auth(must_admin=True)
pass form = self.temp_form.render(attributes=self.attributes.attributes)
return self.temp_adduser.render(form=form)
@cherrypy.expose @cherrypy.expose
def delete(self, **params): def delete(self, **params):