web_reports: Improve element lists

Faster page loads.
More details in the listings.

2 files changed, 34 insertions, 24 deletions

diff --git a/src/lib/Bcfg2/Server/Reports/reports/templates/config_items/listing.html b/src/lib/Bcfg2/Server/Reports/reports/templates/config_items/listing.html
index 9b1026a08..a43eedb89 100644
--- a/src/lib/Bcfg2/Server/Reports/reports/templates/config_items/listing.html
+++ b/src/lib/Bcfg2/Server/Reports/reports/templates/config_items/listing.html
@@ -9,19 +9,20 @@
 {% block pagebanner %}{{mod_or_bad|capfirst}} Element Listing{% endblock %}
 
 {% block content %}
-{% if item_list_dict %}
-  {% for kind, entries in item_list_dict.items %}
-
+{% if item_list %}
+  {% for type_name, type_data in item_list %}
     <div class='entry_list'>
-      <div class='entry_list_head element_list_head' onclick='javascript:toggleMe("table_{{ kind }}");'>
-        <h3>{{ kind }} &#8212; {{ entries|length }}</h3>
-        <div class='entry_expand_tab' id='plusminus_table_{{ kind }}'>[&ndash;]</div>
+      <div class='entry_list_head element_list_head' onclick='javascript:toggleMe("table_{{ type_name }}");'>
+        <h3>{{ type_name }} &#8212; {{ type_data|length }}</h3>
+        <div class='entry_expand_tab' id='plusminus_table_{{ type_name }}'>[&ndash;]</div>
   </div>
-
-      <table id='table_{{ kind }}' class='entry_list'>
-        {% for e in entries %}
+      <table id='table_{{ type_name }}' class='entry_list'>
+          <tr style='text-align: left' ><th>Name</th><th>Count</th><th>Reason</th></tr>
+        {% for entry, reason, eis in type_data %}
           <tr class='{% cycle listview,listview_alt %}'>
-            <td><a href="{% url reports_item type=mod_or_bad,pk=e.id %}">{{e.entry.name}}</a></td>
+            <td><a href="{% url reports_item type=mod_or_bad,pk=eis.0 %}">{{entry.name}}</a></td>
+            <td>{{ eis|length }}</td>
+            <td>{{ reason.short_list|join:"," }}</td>
           </tr>
         {% endfor %}
       </table>
diff --git a/src/lib/Bcfg2/Server/Reports/reports/views.py b/src/lib/Bcfg2/Server/Reports/reports/views.py
index e60a27997..2dd811ca0 100644
--- a/src/lib/Bcfg2/Server/Reports/reports/views.py
+++ b/src/lib/Bcfg2/Server/Reports/reports/views.py
@@ -156,23 +156,32 @@ def config_item_list(request, type, timestamp=None):
         raise Http404
 
     current_clients = Interaction.objects.get_interaction_per_client_ids(timestamp)
-    item_list_dict = {}
-    seen = dict()
-    for x in Entries_interactions.objects.filter(interaction__in=current_clients,
-                                                 type=type).select_related():
-        if (x.entry, x.reason) in seen:
-            continue
-        seen[(x.entry, x.reason)] = 1
-        if item_list_dict.get(x.entry.kind, None):
-            item_list_dict[x.entry.kind].append(x)
-        else:
-            item_list_dict[x.entry.kind] = [x]
 
-    for kind in item_list_dict:
-        item_list_dict[kind].sort(lambda a, b: cmp(a.entry.name, b.entry.name))
+    ldata = list(Entries_interactions.objects.filter(
+            interaction__in=current_clients, type=type).values())
+    entry_ids = set([x['entry_id'] for x in ldata])
+    reason_ids = set([x['reason_id'] for x in ldata])
+
+    entries = Entries.objects.in_bulk(entry_ids)
+    reasons = Reason.objects.in_bulk(reason_ids)
+
+    kind_list = {}
+    [kind_list.__setitem__(kind, {}) for kind in set([e.kind for e in entries.values()])]
+    for x in ldata:
+        kind = entries[x['entry_id']].kind
+        data_key = (x['entry_id'], x['reason_id'])
+        try:
+            kind_list[kind][data_key].append(x['id'])
+        except KeyError:
+            kind_list[kind][data_key] = [x['id']]
+
+    lists = []
+    for kind in kind_list.keys():
+        lists.append((kind, [(entries[e[0][0]], reasons[e[0][1]], e[1])
+            for e in sorted(kind_list[kind].iteritems(), key=lambda x: entries[x[0][0]].name)]))
 
     return render_to_response('config_items/listing.html',
-                              {'item_list_dict': item_list_dict,
+                              {'item_list': lists,
                                'mod_or_bad': mod_or_bad,
                                'timestamp': timestamp},
         context_instance=RequestContext(request))