Fixed bug in display of conflict review targets after they become RFCs. Fixed views of previous version of status changes

 - Legacy-Id: 5429

Author: rjsparks

ietf/idrfc/views_doc.py

@@ -204,6 +204,13 @@ def document_main(request, name, rev=None):
         ballot_summary = None
         if doc.get_state_slug() in ("iesgeval"):
             ballot_summary = needed_ballot_positions(doc, doc.active_ballot().active_ad_positions().values())
+     
+        if isinstance(doc,Document):
+            sorted_relations=doc.relateddocument_set.all().order_by('relationship__name')
+        elif isinstance(doc,DocHistory):
+            sorted_relations=doc.relateddochistory_set.all().order_by('relationship__name')
+        else:
+            sorted_relations=None
 
         return render_to_response("idrfc/document_status_change.html",
                                   dict(doc=doc,
@@ -214,7 +221,7 @@ def document_main(request, name, rev=None):
                                        telechat=telechat,
                                        ballot_summary=ballot_summary,
                                        approved_states=('appr-pend','appr-sent'),
-                                       sorted_relations=doc.relateddocument_set.all().order_by('relationship__name'),
+                                       sorted_relations=sorted_relations,
                                        ),
                                   context_instance=RequestContext(request))
 

ietf/templates/idrfc/document_conflict_review.html

@@ -2,7 +2,7 @@
 
 {% load ietf_filters %}
 
-{% block title %}{{ doc.canonical_name }}-{{ doc.rev }}{% endblock %}
+{% block title %}{{ doc.name }}-{{ doc.rev }}{% endblock %}
 
 {% block pagehead %}
 <link rel="stylesheet" type="text/css" href="/css/doc.css"></link>
@@ -24,7 +24,7 @@
   <div>
     {% if snapshot %}Snapshot of{% endif %}
     {% if doc.get_state_slug not in approved_states %}Proposed{% endif %}
-    IESG Conflict Review for the {{conflictdoc.stream}} document: <a href="{% url doc_view name=conflictdoc.canonical_name %}">{{ conflictdoc.canonical_name }}-{{ conflictdoc.rev }}</a>
+    IESG Conflict Review for the {{conflictdoc.stream}} document: <a href="{% url doc_view name=conflictdoc.canonical_name %}">{{ conflictdoc.canonical_name }}{% if conflictdoc.get_state_slug != 'rfc' %}-{{ conflictdoc.rev }}{% endif %}</a>
   </div>
 
   <table id="metatable" width="100%">
@@ -100,7 +100,7 @@
 
 </div>
 
-<h3>Conflict Review for {{ conflictdoc.canonical_name }}-{{ conflictdoc.rev }}
+<h3>Conflict Review for {{ conflictdoc.name }}-{{ conflictdoc.rev }}
 
 {% if not snapshot and user|has_role:"Area Director,Secretariat" and doc.get_state_slug != 'apprsent' %}
 <a class="edit" href="{% url conflict_review_submit name=doc.name %}">Change conflict review text</a>