# HG changeset patch # User durandn # Date 1469199163 -7200 # Node ID 108f05ed98cbfaacbb18ad86322e15411e23a268 # Parent bdc0014e92dc6f5e36fe27bef76ed59d9bb4ba3c started work on merge view + corrected view error diff -r bdc0014e92dc -r 108f05ed98cb src/iconolab/templates/iconolab/merge_revision.html --- a/src/iconolab/templates/iconolab/merge_revision.html Fri Jul 22 16:52:10 2016 +0200 +++ b/src/iconolab/templates/iconolab/merge_revision.html Fri Jul 22 16:52:43 2016 +0200 @@ -1,3 +1,105 @@ -{{ current_revision.title }} - {{ current_revision.description }} - {{ current_tags_data }} - {{ current_comment }}

-{{ parent_revision.title }} - {{ parent_revision.description }} - {{ parent_tags_data }} - {{ parent_comment }}
-{{ proposal_revision.title }} - {{ proposal_revision.description }} - {{ proposal_tags_data }} - {{ proposal_comment }}
\ No newline at end of file +{% extends 'iconolab_base.html' %} +{% load staticfiles %} +{% load thumbnail %} +{% block content %} +
+
+

Révision courante + +

+
+ Cette révision est la révision actuellement publiée pour l'annotation. +
+
+
+ +   + + + +
+
+ +   + + + +
+
+ +   + + + +
+
+ + +
+
+
+

Révision parente + +

+
+ Cette révision est la révision à partir de laquelle l'annotation proposée a été créée. +
+
+
+ +   + + + +
+
+ +   + + + +
+
+ +   + + + +
+
+ + +
+
+
+

Révision proposée

+ {{ proposal_revision.title }} - {{ proposal_revision.description }} - {{ proposal_tags_data }} - {{ proposal_comment }}
+
+
+{% endblock %} + +{% block footer_js %} + +{% endblock %} diff -r bdc0014e92dc -r 108f05ed98cb src/iconolab/views.py --- a/src/iconolab/views.py Fri Jul 22 16:52:10 2016 +0200 +++ b/src/iconolab/views.py Fri Jul 22 16:52:43 2016 +0200 @@ -423,9 +423,9 @@ context['parent_tags_data'] = revision.parent_revision.get_tags_json() context['parent_comment'] = revision.parent_revision.creation_comment.first() # Current data - context['current_revision'] = revision - context['current_tags_data'] = revision.get_tags_json() - context['current_comment'] = revision.creation_comment.first() + context['current_revision'] = annotation.current_revision + context['current_tags_data'] = annotation.current_revision.get_tags_json() + context['current_comment'] = annotation.current_revision.creation_comment.first() return render(request, 'iconolab/merge_revision.html', context) def post(self, request, *args, **kwargs):