Removed Markdown support for the summary fields in DataSet, Project, …

…and Workflow so that when we view these in the list view, we don't have any weird Markdown syntax.
yvanlebras · May 7, 2014 · 180eacc · 180eacc
1 parent e866ca1
commit 180eacc
Show file tree

Hide file tree

Showing 6 changed files with 6 additions and 9 deletions.
diff --git a/refinery/templates/core/data_set.html b/refinery/templates/core/data_set.html
@@ -452,7 +452,7 @@ <h3>{{ data_set.name }}</h3>
 				<div class="refinery-subheader">
 					<h4>Summary</h4>
 				</div>
-				<p>{% if data_set.summary %} {{ data_set.summary|markdown:"safe" }} {% else %} <i>None provided.</i>{% endif %}</p>
+				<p>{% if data_set.summary %} {{ data_set.summary }} {% else %} <i>None provided.</i>{% endif %}</p>
 
 				<div class="refinery-subheader">
 					<h4>Description</h4>

diff --git a/refinery/templates/core/data_set_edit.html b/refinery/templates/core/data_set_edit.html
@@ -1,5 +1,4 @@
 {% extends "base.html" %}
-{% load markup %}
 
 {% block title %}
 {{ block.super }} - Edit DataSet
@@ -26,7 +25,7 @@ <h3>{{ data_set.name }}</h3>
 			</div>
 
 			<div class="refinery-subheader">
-				<h4>Summary (Supports Markdown)</h4>
+				<h4>Summary</h4>
 			</div>
 			{% if form.summary.errors %}
 				<p class="errors">{{ form.summary.errors.as_text }}</p>

diff --git a/refinery/templates/core/project.html b/refinery/templates/core/project.html
@@ -25,7 +25,7 @@ <h3>{{project.name}}</h3>
 		<div class="refinery-subheader">
 			<h4>Summary</h4>
 		</div>	
-		<p>{% if project.summary %} {{ project.summary|markdown:"safe" }} {% else %} <i>None provided.</i>{% endif %}</p>
+		<p>{% if project.summary %} {{ project.summary }} {% else %} <i>None provided.</i>{% endif %}</p>
 
 		<div class="refinery-subheader">
 			<h4>Description</h4>

diff --git a/refinery/templates/core/project_edit.html b/refinery/templates/core/project_edit.html
@@ -1,5 +1,4 @@
 {% extends "base.html" %}
-{% load markup %}
 
 {% block title %}
 {{ block.super }} - Edit Project
@@ -28,7 +27,7 @@ <h4>Name</h4>
 			<p>{{form.name}}</p>
 
 			<div class="refinery-subheader">
-				<h4>Summary (Supports Markdown)</h4>
+				<h4>Summary</h4>
 			</div>
 			{% if form.summary.errors %}
 			<p class="errors">{{ form.summary.errors.as_text }}</p>

diff --git a/refinery/templates/core/workflow.html b/refinery/templates/core/workflow.html
@@ -35,7 +35,7 @@ <h3>{{ workflow.name }}</h3>
 		<div class="refinery-subheader">
 			<h4>Summary</h4>
 		</div>
-		<p>{% if workflow.summary %} {{ workflow.summary|markdown:"safe" }} {% else %} <i>None provided.</i>{% endif %}</p>
+		<p>{% if workflow.summary %} {{ workflow.summary }} {% else %} <i>None provided.</i>{% endif %}</p>
 
 		<div class="refinery-subheader">
 			<h4>Description</h4>

diff --git a/refinery/templates/core/workflow_edit.html b/refinery/templates/core/workflow_edit.html
@@ -1,5 +1,4 @@
 {% extends "base.html" %}
-{% load markup %}
 
 {% block title %}
 {{ block.super }} - Edit Workflow
@@ -28,7 +27,7 @@ <h4>Name</h4>
 			<p>{{ form.name }}</p>
 
 			<div class="refinery-subheader">
-				<h4>Summary (Supports Markdown)</h4>
+				<h4>Summary</h4>
 			</div>
 			{% if form.summary.errors %}
 				<p class="errors">{{ form.summary.errors.as_text }}</p>