Less SQL queries for per-document page

 - Legacy-Id: 1944

Author: pasieronen

ietf/idrfc/idrfc_wrapper.py

@@ -547,14 +547,15 @@ def _init(self):
             ads = set()
 
         positions = []
+        all_comments = self.ballot.comments.all().select_related('ad')
         for p in self.ballot.positions.all().select_related('ad'):
-            po = create_position_object(self.ballot, p)
+            po = create_position_object(self.ballot, p, all_comments)
             #if not self.ballot_active:
             #    if 'is_old_ad' in po:
             #        del po['is_old_ad']
             ads.add(str(p.ad))
             positions.append(po)
-        for c in self.ballot.comments.all().select_related('ad'):
+        for c in all_comments:
             if (str(c.ad) not in ads) and c.ad.is_current_ad():
                 positions.append({'has_text':True,
                                   'comment_text':c.text,
@@ -620,7 +621,7 @@ def position_to_string(position):
         p = "No Record"
     return p
 
-def create_position_object(ballot, position):
+def create_position_object(ballot, position, all_comments):
     positions = {"yes":"Yes",
                  "noobj":"No Objection",
                  "discuss":"Discuss",
@@ -640,15 +641,16 @@ def create_position_object(ballot, position):
     if len(was) > 0:
         r['old_positions'] = was
 
-    try:
-        comment = ballot.comments.get(ad=position.ad)
-        if comment and comment.text: 
-            r['has_text'] =  True
-            r['comment_text'] = comment.text
-            r['comment_date'] = comment.date
-            r['comment_revision'] = str(comment.revision)
-    except IESGComment.DoesNotExist:
-        pass
+    comment = None
+    for c in all_comments:
+        if c.ad == position.ad:
+            comment = c
+            break
+    if comment and comment.text: 
+        r['has_text'] =  True
+        r['comment_text'] = comment.text
+        r['comment_date'] = comment.date
+        r['comment_revision'] = str(comment.revision)
 
     if p == "Discuss":
         try:

ietf/idrfc/views_doc.py

@@ -81,16 +81,11 @@ def document_main_rfc(request, rfc_number):
         "rfc"+str(rfc_number)+",html", 
         os.path.join(settings.RFC_PATH, "rfc"+str(rfc_number)+".txt"))
 
-    if doc.in_ietf_process() and doc.ietf_process.has_iesg_ballot():
-        ballot = doc.ietf_process.iesg_ballot()
-    else:
-        ballot = None
-        
-    history = _get_history(doc)
+    history = _get_history(doc, None)
 
     return render_to_response('idrfc/doc_main_rfc.html',
                               {'content1':content1, 'content2':content2,
-                               'doc':doc, 'info':info, 'ballot':ballot,
+                               'doc':doc, 'info':info, 
                                'history':history},
                               context_instance=RequestContext(request));
 
@@ -130,22 +125,17 @@ def document_main(request, name):
         str(name)+","+str(id.revision)+",html",
         os.path.join(settings.INTERNET_DRAFT_PATH, name+"-"+id.revision+".txt"))
 
-    if doc.in_ietf_process() and doc.ietf_process.has_iesg_ballot():
-        ballot = doc.ietf_process.iesg_ballot()
-    else:
-        ballot = None
-
     versions = _get_versions(id)
-    history = _get_history(doc)
+    history = _get_history(doc, versions)
 
     return render_to_response('idrfc/doc_main_id.html',
                               {'content1':content1, 'content2':content2,
-                               'doc':doc, 'info':info, 'ballot':ballot,
+                               'doc':doc, 'info':info, 
                                'versions':versions, 'history':history},
                               context_instance=RequestContext(request));
 
 # doc is either IdWrapper or RfcWrapper
-def _get_history(doc):
+def _get_history(doc, versions):
     results = []
     if doc.is_id_wrapper:
         comments = DocumentComment.objects.filter(document=doc.tracker_id)
@@ -159,12 +149,12 @@ def _get_history(doc):
         info['textSnippet'] = truncatewords_html(format_textarea(fill(info['text'], 80)), 25)
         info['snipped'] = info['textSnippet'][-3:] == "..."
         results.append({'comment':comment, 'info':info, 'date':comment.datetime(), 'is_com':True})
-    if doc.is_id_wrapper:
-        versions = _get_versions(doc._draft, False)
-        versions.reverse()
+    if doc.is_id_wrapper and versions:
         for v in versions:
-            v['is_rev'] = True
-            results.append(v)
+            if v['draft_name'] == doc.draft_name:
+                v = dict(v) # copy it, since we're modifying datetimes later
+                v['is_rev'] = True
+                results.insert(0, v)    
     if doc.is_id_wrapper and doc.draft_status == "Expired" and doc._draft.expiration_date:
         results.append({'is_text':True, 'date':doc._draft.expiration_date, 'text':'Draft expired'})
     if doc.is_rfc_wrapper:

ietf/templates/idrfc/doc_main.html

@@ -70,7 +70,7 @@ <h1 style="margin-top:0;">{% block doc_h1 %}{% endblock %}</h1>
 <div id="mytabs" class="yui-navset">
 <ul class="yui-nav">
   <li class="selected"><a href="#doc"><em>Document</em></a></li>
-  <li {% if not ballot %}class="disabled" {%endif%}><a href="#ballot"><em>IESG Evaluation Record</em></a></li>
+  <li{% if doc.in_ietf_process and doc.ietf_process.has_iesg_ballot %}{%else%} class="disabled"{%endif%}><a href="#ballot"><em>IESG Evaluation Record</em></a></li>
   <li {% if doc.in_ietf_process and doc.ietf_process.has_iesg_ballot %}{%else%}class="disabled" {%endif%}><a href="#writeup"><em>IESG Writeups</em></a></li>
   <li><a href="#history"><em>History</em></a></li>
 </ul>
@@ -84,10 +84,12 @@ <h1 style="margin-top:0;">{% block doc_h1 %}{% endblock %}</h1>
 
 <div id="ballot">
 <div id="ballot_content">
-{% if ballot %}
+{% if doc.in_ietf_process and doc.ietf_process.has_iesg_ballot  %}
 {% with 1 as doc_ballot_edit_button %}
+{% with doc.ietf_process.iesg_ballot as ballot %}
 {% include "idrfc/doc_ballot.html" %}
 {% endwith %}
+{% endwith %}
 {% endif %}
 </div>
 </div> 

ietf/templates/idrfc/doc_main_id.html

@@ -43,7 +43,7 @@
 <tr><td>State:</td><td> 
 {{ doc.friendly_state|safe }}
 {% if doc.rfc_editor_state %}<br />RFC Editor State: <a href="http://www.rfc-editor.org/queue2.html#{{doc.draft_name}}">{{ doc.rfc_editor_state|escape }}</a>{% endif %}
-{% if doc.replaces %}<br />Replaces {% for rep in doc.replaces %}<a href="/doc/{{rep}}/">{{rep}}</a> {% endfor %}{% endif %}
+{% with doc.replaces as r %}{% if r %}<br />Replaces {% for rep in r %}<a href="/doc/{{rep}}/">{{rep}}</a> {% endfor %}{% endif %}{% endwith %}
 </td></tr>
 
 <tr><td>Intended status:</td><td>{% if doc.in_ietf_process %}{{ doc.ietf_process.intended_maturity_level|default:"-"  }}{% else %}-{%endif%}</td></tr>