diff --git a/helios/models.py b/helios/models.py index a4ac9f4d1..95444b217 100644 --- a/helios/models.py +++ b/helios/models.py @@ -197,7 +197,7 @@ def is_archived(self): @property def description_bleached(self): return bleach.clean(self.description, - tags=bleach.ALLOWED_TAGS + ['p', 'h4', 'h5', 'h3', 'h2', 'br', 'u'], + tags=list(bleach.ALLOWED_TAGS) + ['p', 'h4', 'h5', 'h3', 'h2', 'br', 'u'], strip=True, strip_comments=True, ) diff --git a/helios/widgets.py b/helios/widgets.py index ba271ce70..40e3ba2ea 100644 --- a/helios/widgets.py +++ b/helios/widgets.py @@ -210,4 +210,4 @@ def compress(self, data_list): def render(self, name, value, attrs=None, renderer=None): value = self.compress(value) rendered_widgets = list(widget.render(name, value, attrs=attrs, renderer=renderer) for widget in self.widgets) - return '
'.join(rendered_widgets) + return mark_safe('
'.join(rendered_widgets)) diff --git a/settings.py b/settings.py index 34b9c9ed3..4fcfd2182 100644 --- a/settings.py +++ b/settings.py @@ -62,6 +62,8 @@ def get_from_env(var, default): # system time zone. TIME_ZONE = 'America/Los_Angeles' +USE_TZ = False + # Language code for this installation. All choices can be found here: # http://www.i18nguy.com/unicode/language-identifiers.html LANGUAGE_CODE = 'en-us'