Commit 2133d2cf authored by Robin Sonnabend's avatar Robin Sonnabend
Browse files

Merge branch 'master' of git.fsmpi.rwth-aachen.de:protokollsystem/proto3

parents fff182e6 3aec2b7a
...@@ -65,6 +65,7 @@ class LdapManager: ...@@ -65,6 +65,7 @@ class LdapManager:
connection = ldap3.Connection(self.server) connection = ldap3.Connection(self.server)
obj_def = ldap3.ObjectDef("posixgroup", connection) obj_def = ldap3.ObjectDef("posixgroup", connection)
group_reader = ldap3.Reader(connection, obj_def, self.group_dn) group_reader = ldap3.Reader(connection, obj_def, self.group_dn)
username = username.lower()
for group in group_reader.search(): for group in group_reader.search():
members = group.memberUid.value members = group.memberUid.value
if members is not None and username in members: if members is not None and username in members:
......
...@@ -326,7 +326,7 @@ def new_default_top(protocoltype): ...@@ -326,7 +326,7 @@ def new_default_top(protocoltype):
for protocol in protocoltype.protocols: for protocol in protocoltype.protocols:
if not protocol.done: if not protocol.done:
localtop = LocalTOP(protocol_id=protocol.id, localtop = LocalTOP(protocol_id=protocol.id,
defaulttop_id=defaultop.id, description="") defaulttop_id=defaulttop.id, description="")
db.session.add(localtop) db.session.add(localtop)
db.session.commit() db.session.commit()
flash("Der Standard-TOP {} wurde für dem Protokolltyp {} hinzugefügt.".format(defaulttop.name, protocoltype.name), "alert-success") flash("Der Standard-TOP {} wurde für dem Protokolltyp {} hinzugefügt.".format(defaulttop.name, protocoltype.name), "alert-success")
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment