jpt-archive/django-markupwiki
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

article_diff move

Browse Source
This commit is contained in:
James Turk 2010-04-02 14:07:51 -04:00
parent b43d6d501a
commit fde627eda0
2 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
markupwiki/templates/article_diff.html → markupwiki/templates/markupwiki/article_diff.html
View File

@ -15,6 +15,6 @@
{% block content %} {% block content %}
<h2>comparison of {{article.title}} revision {{from}} to {{to}}</h2> <h2>comparison of {{article.title}} revision {{from}} to {{to}}</h2>
<br style="clear: both;">
{{ table|safe }} {{ table|safe }}
{% endblock content %} {% endblock content %}

5
markupwiki/views.py
View File

@ -50,6 +50,9 @@ def view_article(request, title, n=None):
version = article.versions.latest() version = article.versions.latest()
version.is_latest = True version.is_latest = True
# display title
article.title = article.title.replace('_', ' ')
# set editable flag on article # set editable flag on article
article.editable = article.is_editable_by_user(request.user) article.editable = article.is_editable_by_user(request.user)
@ -194,7 +197,7 @@ def article_diff(request, title):
from_body = from_version.body.raw.split('\n') from_body = from_version.body.raw.split('\n')
to_body = to_version.body.raw.split('\n') to_body = to_version.body.raw.split('\n')
table = differ.make_table(from_body, to_body) table = differ.make_table(from_body, to_body)
return render_to_response('article_diff.html', return render_to_response('markupwiki/article_diff.html',
{'article': article, 'table':table, {'article': article, 'table':table,
'from': from_id, 'to':to_id}, 'from': from_id, 'to':to_id},
context_instance=RequestContext(request)) context_instance=RequestContext(request))