1
0
mirror of https://github.com/moepman/bk-dss synced 2024-12-22 12:44:27 +01:00

Rename function list to list_users.

The function list shadowed the built-in type list leading to weird
TypeError exceptions in the user creation.

While at it list the users cn before the dn to improve readability.
This commit is contained in:
Markus 2016-04-16 21:03:11 +02:00
parent 5aabd7ed6d
commit 46e560cef9
2 changed files with 12 additions and 6 deletions

View File

@ -91,7 +91,7 @@ def create():
user_dn = app.config.get('USER_DN').format(**d) user_dn = app.config.get('USER_DN').format(**d)
attrs = {} attrs = {}
for k,v in app.config.get('USER_ATTRS').iteritems(): for k,v in app.config.get('USER_ATTRS').iteritems():
if type(v) == str: if isinstance(v, str):
attrs[k] = v.format(**d) attrs[k] = v.format(**d)
elif isinstance(v, list): elif isinstance(v, list):
attrs[k] = [] attrs[k] = []
@ -142,13 +142,13 @@ def edit():
@app.route('/list') @app.route('/list')
def list(): def list_users():
if not isLoggedin(): if not isLoggedin():
return render_template('error.html', message="You are not logged in. Please log in first.", nav=buildNav()) return render_template('error.html', message="You are not logged in. Please log in first.", nav=buildNav())
l = ldap.initialize(app.config.get('LDAP_URI', 'ldaps://127.0.0.1')) l = ldap.initialize(app.config.get('LDAP_URI', 'ldaps://127.0.0.1'))
l.simple_bind_s(rdb.hget(session['uuid'], 'user'), rdb.hget(session['uuid'], 'pswd')) l.simple_bind_s(rdb.hget(session['uuid'], 'user'), rdb.hget(session['uuid'], 'pswd'))
sr = l.search_s(app.config.get('LDAP_BASE'), ldap.SCOPE_SUBTREE, '(objectClass=posixAccount)', ['']) sr = l.search_s(app.config.get('LDAP_BASE'), ldap.SCOPE_SUBTREE, '(objectClass=posixAccount)', ['cn'])
return render_template('list.html', users=sr, nav=buildNav()) return render_template('list.html', users=sr, nav=buildNav())

View File

@ -5,11 +5,17 @@
</div> </div>
<table class="table table-bordered table-striped"> <table class="table table-bordered table-striped">
<thead> <thead>
<tr><td>DN</td></tr> <tr>
<td>CN</td>
<td>DN</td>
</tr>
</thead> </thead>
<tbody> <tbody>
{% for dn, _ in users %} {% for dn, attr in users %}
<tr><td>{{ dn }}</td></tr> <tr>
<td>{{ attr['cn'][0] }}</td>
<td>{{ dn }}</td>
</tr>
{% endfor %} {% endfor %}
</tbody> </tbody>
</table> </table>