Show solutions if available

project/lint/templatetags/lint.py

@@ -13,14 +13,19 @@ def report_create_form():
 
 
 @register.inclusion_tag('lint/tags/results_fix.html')
-def results_fix(data):
-    lines = json.loads(data, )
-    result = []
-    for line_info in lines:
-        result.append({
+def results_fix(fix):
+    source_result, solution_result = [], []
+    for line_info in json.loads(fix.source):
+        source_result.append({
             'number': line_info[0],
             'is_significant': line_info[1],
             'text': line_info[2],
         })
-    return {'result': result}
-
+    for line_info in json.loads(fix.solution):
+        solution_result.append({
+            'number': line_info[0],
+            'is_significant': line_info[1],
+            'text': line_info[2],
+        })
+    return {'source_result': source_result, 'fix': fix,
+            'solution_result': solution_result}

project/templates/lint/results.html

@@ -13,14 +13,7 @@ <h2>Results url:</h2>
   <h2>Fixes:</h2>
   {% with report.fixes.all as fixes %}
   {% for fix in fixes %}
-  <div class="description">
-    <h3{% if forloop.first %} class="first"{% endif %}>{{ fix.path }}</h3>
-    <p>{{ fix.description }}</p>
-    {% results_fix fix.source %}
-    {% if fix.solution %}
-      {% results_fix fix.solution %}
-    {% endif %}
-  </div>
+    {% results_fix fix %}
   {% endfor %}
   {% endwith %}
 {% endblock %}

project/templates/lint/tags/results_fix.html

@@ -1,5 +1,18 @@
-{% for line in result %}
-{% if forloop.first %}<ol class="fix{% if solution %} yes{% endif %}" start="{{ line.number }}">{% endif %}
-<li{% if line.is_significant %} class="significant"{% endif %}><pre><code>{{ line.text }}</code></pre></li>
-{% if froloop.last %}</ol>{% endif %}
-{% endfor %}
+<div class="description">
+  <h3{% if forloop.first %} class="first"{% endif %}>{{ fix.path }}</h3>
+  <p>{{ fix.description }}</p>
+
+  {% for line in source_result %}
+    {% if forloop.first %}<ol class="fix" start="{{ line.number }}">{% endif %}
+    <li{% if line.is_significant %} class="significant"{% endif %}><pre><code>{{ line.text }}</code></pre></li>
+    {% if froloop.last %}</ol>{% endif %}
+  {% endfor %}
+  {% if fix.solution %}
+
+  {% for line in solution_result %}
+    {% if forloop.first %}<ol class="fix yes" start="{{ line.number }}">{% endif %}
+    <li{% if line.is_significant %} class="significant"{% endif %}><pre><code>{{ line.text }}</code></pre></li>
+    {% if froloop.last %}</ol>{% endif %}
+  {% endfor %}
+  {% endif %}
+</div>