diff options
| -rw-r--r-- | newsdiff/core/views.py | 13 | ||||
| -rw-r--r-- | newsdiff/templates/article.html | 5 |
2 files changed, 12 insertions, 6 deletions
diff --git a/newsdiff/core/views.py b/newsdiff/core/views.py index 579f593..a66fc08 100644 --- a/newsdiff/core/views.py +++ b/newsdiff/core/views.py @@ -11,14 +11,17 @@ class ArticleView(DetailView): slug_url_kwarg = 'id' template_name = 'article.html' - def get_context_data(self, **kwargs): - context = super(ArticleView, self).get_context_data(**kwargs) + def _get_diffs(self): versions = reversion.get_for_object(self.object) version_diffs = [(v1, v2) for v1, v2 in zip(versions, versions[1:])] - context['diffs'] = [{ - 'diff': generate_patch_html(v2, v1, 'text', cleanup='semantic') + return [{ + 'diff': generate_patch_html(v2, v1, 'text', cleanup='semantic'), + 'date': v1.revision.date_created } for (v1, v2) in version_diffs] - # context['diffs'] = [(v1, v2) for v1, v2 in zip(versions, versions[1:])] + + def get_context_data(self, **kwargs): + context = super(ArticleView, self).get_context_data(**kwargs) + context['diffs'] = self._get_diffs() return context diff --git a/newsdiff/templates/article.html b/newsdiff/templates/article.html index a54604b..2fee9e5 100644 --- a/newsdiff/templates/article.html +++ b/newsdiff/templates/article.html @@ -14,9 +14,12 @@ {% endthumbnail %} {% endfor %} <pre style="white-space: pre-wrap;">{{ article.text }}</pre> + <br/><br/> + <h3>גרסאות קודמות</h3> {% for diff in diffs %} <hr> - <pre style="white-space: pre-wrap;">{{ diff.diff|safe }}</pre> + <pre style="white-space: pre-wrap;">{{ diff.date|date:'d/m/Y' }}<br/>{{ diff.date|date:'H:i' }}<br/><br/>{{ diff.diff|safe }} + </pre> {% endfor %} </body> </html> |