From 690f7e8996dd0d314697f386678dbd96fce56ad2 Mon Sep 17 00:00:00 2001
From: Ulrich Knechtelsdorfer <ulrichknecht@yahoo.de>
Date: Sat, 9 Jul 2016 09:11:17 +0200
Subject: [PATCH] - fix edit user rfid bug

---
 app/database.py                      | 3 ++-
 app/templates/manage_users.html      | 2 +-
 app/templates/manage_users_edit.html | 2 +-
 3 files changed, 4 insertions(+), 3 deletions(-)

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 @@
 			<td>{{user.name}}</td>
 			<td>{{user.longname}}</td>
 			<td>{{user.email}}</td>
-			<td>{% if user.rfid_id %} {% for rfid_id in user.rfid_id %} {{rfid_id}};{% endfor %} {% endif %}</td>
+			<td>{{user.rfid_id}}</td>
 			<td>{% if user.isblack %} &#9745; {% else %} &#9744; {% endif %} </td>
 			<td>{% if user.isbaron %} &#9745; {% else %} &#9744; {% endif %} </td>
 			<td>{% if user.isshown %} &#9745; {% else %} &#9744; {% endif %} </td>
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:<br><input type="text" name="username" required value="{{user_to_edit.name}}" /> <br>
 		Name:<br><input type="text" name="longname" required value="{{user_to_edit.longname}}" /><br>
 		Email:<br><input type="email" name="email" required value="{{user_to_edit.email}}" /><br>
-		Euml ID: (falls mehrere durch ; trennen)<br><input type="text" name="rfid_id" value="{% if user_to_edit.rfid_id %}{% for rfid_id in user_to_edit.rfid_id %}{{rfid_id}};{% endfor %}{% endif %}" /><br>
+		Euml ID: (falls mehrere durch ; trennen)<br><input type="text" name="rfid_id" value="{{user_to_edit.rfid_id}}" /><br>
 		Geschwärzt: <input type="checkbox" name="isblack"  {% if user_to_edit.isblack %} checked {% endif %} /> <br>
 		Baron: <input type="checkbox" name="isbaron" {% if user_to_edit.isbaron %} checked {% endif %} /> <br>
 		Angezeigt: <input type="checkbox" name="isshown" {% if user_to_edit.isshown %} checked {% endif %} /><br>