Ticket #833: bcfg2-1.1.0-fix-833.patch

src/lib/Server/Reports/reports/views.py

@@ -40 +40 @@
             cursor.execute("select client_id from reports_interaction, reports_entries_interactions, reports_client "+
                    "WHERE reports_entries_interactions.interaction_id IN %s "+
                    "AND reports_entries_interactions.interaction_id = reports_interaction.id "+
-                   "AND reports_entries_interactions.modified_id = %s " +
-                   "AND reports_entries_interactions.type = %s ", [interactionlist, eyedee, type])
+                   "AND reports_entries_interactions.entry_id = %s " +
+                   "AND reports_entries_interactions.type = %s ", [interactionlist, item.entry_id, type])
             associated_client_list = Client.objects.active(timestamp).filter(id__in=[x[0] for x in cursor.fetchall()])
         else:
             associated_client_list = []
@@ -131 +131 @@
     if entry_max:
         for client in client_list:
             try:
-                e = interaction.objects.filter(client=client).filter(timestamp__lt=entry_max).order_by('-timestamp')[0]
+                e = Interaction.objects.filter(client=client).filter(timestamp__lt=entry_max).order_by('-timestamp')[0]
                 if 'server' in context and e.server != context['server']:
                     continue
                 if 'state' in context and e.state != context['state']:

src/lib/Server/Reports/reports/templates/config_items/index.html

@@ -63 +63 @@
     <input type="button"
            name="go"
            value="Go"
-           onClick="location.href='{% url Bcfg2.Server.Reports.reports.views.config_item_modified eyedee=item.entry.id%}'+document.forms['timestamp-select'].date1.value+'@'+document.forms['timestamp-select'].time.value;" />
+           onClick="location.href='{% url Bcfg2.Server.Reports.reports.views.config_item_modified eyedee=item.id%}'+document.forms['timestamp-select'].date1.value+'@'+document.forms['timestamp-select'].time.value;" />
     | <input type="button"
              name="now"
              value="Now"
-             onClick="location.href='{% url Bcfg2.Server.Reports.reports.views.config_item_modified eyedee=item.entry.id%}';"/>
+             onClick="location.href='{% url Bcfg2.Server.Reports.reports.views.config_item_modified eyedee=item.id %}';"/>
 {% else %}
     <input type="button"
            name="go"
            value="Go"
-           onClick="location.href='{% url Bcfg2.Server.Reports.reports.views.config_item_bad eyedee=item.entry.id %}'+document.forms['timestamp-select'].date1.value+'@'+document.forms['timestamp-select'].time.value;"/>
+           onClick="location.href='{% url Bcfg2.Server.Reports.reports.views.config_item_bad eyedee=item.id %}'+document.forms['timestamp-select'].date1.value+'@'+document.forms['timestamp-select'].time.value;"/>
     | <input type="button"
              name="now"
              value="Now"
-             onClick="location.href='{% url Bcfg2.Server.Reports.reports.views.config_item_bad eyedee=item.entry.id %}';"/>
+             onClick="location.href='{% url Bcfg2.Server.Reports.reports.views.config_item_bad eyedee=item.id %}';"/>
 {% endifequal %}
 </span></form>
 <br/><br/><br/></div>