Fixing preview function to use correct revision id

wiki/templates/wiki/history.html

@@ -91,7 +91,7 @@
                       {% trans "Preview this version" %}
                     </a>
                     {% else %}
-                    <button type="submit" class="btn" onclick="$('#previewModal').modal('show'); this.form.target='previewWindow'; this.form.action='{% url 'wiki:preview_revision' revision.id %}'; $('#previewModal .switch-to-revision').attr('href', '{% url 'wiki:change_revision_url' urlpath.path revision.id %}')">
+                    <button type="submit" class="btn" onclick="$('#previewModal').modal('show'); this.form.target='previewWindow'; this.form.r.value='{{ revision.id }}'; this.form.action='{% url 'wiki:preview_revision' article.id %}'; $('#previewModal .switch-to-revision').attr('href', '{% url 'wiki:change_revision_url' urlpath.path revision.id %}')">
                       <span class="icon-eye-open"></span>
                       {% trans "Preview this version" %}
                     </button>
@@ -157,6 +157,7 @@
           {% endif %}
           
         </div>
+        <input type="hidden" name="r" value="" />
         <div class="modal hide fade" id="previewModal" style="width: 80%; margin-left: -40%;">
           <div class="modal-body">
             <iframe name="previewWindow" style="width: 100%; height: 100%; border: 0;" frameborder="0"></iframe>

wiki/views/article.py

@@ -221,7 +221,7 @@ def preview(request, article, urlpath=None, template_file="wiki/preview_inline.h
     content = article.current_revision.content
     title = article.current_revision.title
     
-    revision_id = request.GET.get('revision_id', None)
+    revision_id = request.GET.get('r', None)
     revision = None
     
     if request.method == 'POST':