Merge branch 'master' of github.com:okfn/ckan into 3028-dashboard-act…

…ivity-stream-filtering
ckan · Dec 20, 2012 · 9e1ce7b · 9e1ce7b
2 parents 9668ad3 + b208572
commit 9e1ce7b
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 1 deletion.
diff --git a/ckan/templates/ajax_snippets/popover_context_dataset.html b/ckan/templates/ajax_snippets/popover_context_dataset.html
@@ -1,5 +1,6 @@
 <div class="popover-context profile-info">
 	{% if notes != 'null' %}
+		{% set notes = notes|striptags %}
 		<p class="about">
 			{{ h.truncate(notes, length=160, whole_word=True) }}
 		</p>

diff --git a/ckan/templates/ajax_snippets/popover_context_group.html b/ckan/templates/ajax_snippets/popover_context_group.html
@@ -1,5 +1,6 @@
 <div class="popover-context profile-info">
-	{% if notes != 'null' %}
+	{% if description != 'null' %}
+		{% set description = description|striptags %}
 		<p class="about">
 			{{ h.truncate(description, length=160, whole_word=True) }}
 		</p>

diff --git a/ckan/templates/ajax_snippets/popover_context_user.html b/ckan/templates/ajax_snippets/popover_context_user.html
@@ -1,5 +1,6 @@
 <div class="popover-context profile-info">
 	{% if about != 'null' %}
+		{% set about = about|striptags %}
 		<p class="about">
 			{{ h.truncate(about, length=160, whole_word=True) }}
 		</p>