diff --git a/admin/migrations/0002_auto__del_field_alias_mbox.py b/admin/migrations/0002_auto__del_field_alias_mbox.py index 586ba976e..3b8370b2f 100644 --- a/admin/migrations/0002_auto__del_field_alias_mbox.py +++ b/admin/migrations/0002_auto__del_field_alias_mbox.py @@ -5,6 +5,7 @@ from south.v2 import SchemaMigration from django.db import models class Migration(SchemaMigration): + no_dry_dun = True def forwards(self, orm): diff --git a/lib/templatetags/libextras.py b/lib/templatetags/libextras.py index 4e76f0dc2..f8a99ee77 100644 --- a/lib/templatetags/libextras.py +++ b/lib/templatetags/libextras.py @@ -17,3 +17,12 @@ def get_version(): return output.rstrip() else: return "Unknown" + +@register.simple_tag +def join(items, sep=','): + res = "" + for k, v in items.iteritems(): + if res != "": + res += sep + res += "%s : '%s'" % (k, v) + return res diff --git a/templates/common/email_listing.html b/templates/common/email_listing.html index 12ed2b48b..9dba8538f 100644 --- a/templates/common/email_listing.html +++ b/templates/common/email_listing.html @@ -1,5 +1,6 @@ {% extends "nlayout.html" %} {% load i18n %} +{% load libextras %} {% block html_head %}