From: Magnus Hagander <magnus@hagander.net>
Date: Sun, 14 Oct 2018 18:10:52 +0000 (+0200)
Subject: One more try, even more unicode fixes
X-Git-Url: http://git.postgresql.org/gitweb/?a=commitdiff_plain;h=99623d51c018fe6996dc4ee7145f5fb6ecf5e669;p=pgeu-website.git

One more try, even more unicode fixes
---

diff --git a/postgresqleu/confwiki/views.py b/postgresqleu/confwiki/views.py
index 9ef3290..b6aa55e 100644
--- a/postgresqleu/confwiki/views.py
+++ b/postgresqleu/confwiki/views.py
@@ -229,7 +229,15 @@ def admin_edit_page(request, urlname, pageid):
 				form.save_m2m()
 				s = StringIO()
 				for k,v in f.diff.items():
-					s.write(u"Changed {0} from {1} to {2}\n".format(k, v[0], v[1]).encode('utf8'))
+					if type(v[0]) == list:
+						fr = u", ".join([unicode(o) for o in v[0]])
+					else:
+						fr = v[0]
+					if type(v[1]) == list:
+						to = u", ".join([unicode(o) for o in v[1]])
+					else:
+						to = v[1]
+					s.write(u"Changed {0} from {1} to {2}\n".format(k, fr, to).encode('utf8'))
 				if s.tell() > 0:
 					# Something changed, so generate audit email
 					send_simple_mail(conference.contactaddr,