1 files changed, 29 insertions, 27 deletions
diff --git a/src/lib/Bcfg2/Server/Reports/reports/templates/clients/detail.html b/src/lib/Bcfg2/Server/Reports/reports/templates/clients/detail.html
index dd4295f21..9b86b609f 100644
--- a/src/lib/Bcfg2/Server/Reports/reports/templates/clients/detail.html
+++ b/src/lib/Bcfg2/Server/Reports/reports/templates/clients/detail.html
@@ -50,6 +50,9 @@ span.history_links a {
     {% if interaction.server %}
     <tr><td>Served by</td><td>{{interaction.server}}</td></tr>
     {% endif %}
+    {% if interaction.metadata %}
+    <tr><td>Profile</td><td>{{interaction.metadata.profile}}</td></tr>
+    {% endif %}
     {% if interaction.repo_rev_code %}
     <tr><td>Revision</td><td>{{interaction.repo_rev_code}}</td></tr>
     {% endif %}
@@ -60,58 +63,57 @@ span.history_links a {
     {% endif %}
   </table>
 
-  {% if interaction.bad_entry_count %}
+  {% if interaction.metadata.groups.count %}
   <div class='entry_list'>
-    <div class='entry_list_head dirty-lineitem' onclick='javascript:toggleMe("bad_table");'>
-      <h3>Bad Entries &#8212; {{ interaction.bad_entry_count }}</h3>
-      <div class='entry_expand_tab' id='plusminus_bad_table'>[+]</div>
+    <div class='entry_list_head' onclick='javascript:toggleMe("groups_table");'>
+      <h3>Group membership</h3>
+      <div class='entry_expand_tab' id='plusminus_groups_table'>[+]</div>
     </div>
-    <table id='bad_table' class='entry_list'>
-      {% for e in interaction.bad|sortwell %}
+    <table id='groups_table' class='entry_list' style='display: none'>
+      {% for group in interaction.metadata.groups.all %}
         <tr class='{% cycle listview,listview_alt %}'>
-          <td class='entry_list_type'>{{e.entry.kind}}:</td>
-          <td><a href="{% url reports_item "bad",e.id %}">
-              {{e.entry.name}}</a></td>
+          <td class='entry_list_type'>{{group}}</td>
         </tr>
       {% endfor %}
     </table>
   </div>
   {% endif %}
 
-  {% if interaction.modified_entry_count %}
+  {% if interaction.metadata.bundles.count %}
   <div class='entry_list'>
-    <div class='entry_list_head modified-lineitem' onclick='javascript:toggleMe("modified_table");'>
-      <h3>Modified Entries &#8212; {{ interaction.modified_entry_count }}</h3>
-      <div class='entry_expand_tab' id='plusminus_modified_table'>[+]</div>
+    <div class='entry_list_head' onclick='javascript:toggleMe("bundles_table");'>
+      <h3>Bundle membership</h3>
+      <div class='entry_expand_tab' id='plusminus_bundless_table'>[+]</div>
     </div>
-    <table id='modified_table' class='entry_list'>
-      {% for e in interaction.modified|sortwell %}
+    <table id='bundles_table' class='entry_list' style='display: none'>
+      {% for bundle in interaction.metadata.bundles.all %}
         <tr class='{% cycle listview,listview_alt %}'>
-          <td class='entry_list_type'>{{e.entry.kind}}:</td>
-          <td><a href="{% url reports_item "modified",e.id %}">
-              {{e.entry.name}}</a></td>
+          <td class='entry_list_type'>{{bundle}}</td>
         </tr>
       {% endfor %}
     </table>
   </div>
   {% endif %}
 
-  {% if interaction.extra_entry_count %}
+  {% for type, ei_list in ei_lists %}
+  {% if ei_list %}
   <div class='entry_list'>
-    <div class='entry_list_head extra-lineitem' onclick='javascript:toggleMe("extra_table");'>
-      <h3>Extra Entries &#8212; {{ interaction.extra_entry_count }}</h3>
-      <div class='entry_expand_tab' id='plusminus_extra_table'>[+]</div>
+    <div class='entry_list_head {{type}}-lineitem' onclick='javascript:toggleMe("{{type}}_table");'>
+      <h3>{{ type|capfirst }} Entries &#8212; {{ ei_list|length }}</h3>
+      <div class='entry_expand_tab' id='plusminus_{{type}}_table'>[+]</div>
     </div>
-    <table id='extra_table' class='entry_list'>
-      {% for e in interaction.extra|sortwell %}
+    <table id='{{type}}_table' class='entry_list'>
+      {% for ei in ei_list %}
         <tr class='{% cycle listview,listview_alt %}'>
-          <td class='entry_list_type'>{{e.entry.kind}}:</td>
-          <td><a href="{% url reports_item "extra",e.id %}">{{e.entry.name}}</a></td>
+          <td class='entry_list_type'>{{ei.entry.kind}}</td>
+          <td><a href="{% url reports_item type ei.id %}">
+              {{ei.entry.name}}</a></td>
         </tr>
-    {% endfor %}
+      {% endfor %}
     </table>
   </div>
   {% endif %}
+  {% endfor %}
 
   {% if entry_list %}
   <div class="entry_list recent_history_wrapper">