diff --git a/app/database.py b/app/database.py index 78e3ed5..8a78147 100644 --- a/app/database.py +++ b/app/database.py @@ -138,7 +138,8 @@ def get_rfid_ids_by_userid(user_id): rfid_ids = [] for row in rows: rfid_ids.append(row[2]) - return rfid_ids + + return ";".join(rfid_ids) def set_rfid_to_userid(rfid_ids, user_id): new_rfids = rfid_ids.replace(" ","").split(";") diff --git a/app/templates/manage_users.html b/app/templates/manage_users.html index 97ca725..2522ea2 100644 --- a/app/templates/manage_users.html +++ b/app/templates/manage_users.html @@ -22,7 +22,7 @@ {{user.name}} {{user.longname}} {{user.email}} - {% if user.rfid_id %} {% for rfid_id in user.rfid_id %} {{rfid_id}};{% endfor %} {% endif %} + {{user.rfid_id}} {% if user.isblack %} ☑ {% else %} ☐ {% endif %} {% if user.isbaron %} ☑ {% else %} ☐ {% endif %} {% if user.isshown %} ☑ {% else %} ☐ {% endif %} diff --git a/app/templates/manage_users_edit.html b/app/templates/manage_users_edit.html index 18af959..4958d46 100644 --- a/app/templates/manage_users_edit.html +++ b/app/templates/manage_users_edit.html @@ -13,7 +13,7 @@ Username:

Name:

Email:

- Euml ID: (falls mehrere durch ; trennen)

+ Euml ID: (falls mehrere durch ; trennen)

Geschwärzt:
Baron:
Angezeigt: