From d58d650a4816021fb73309d4c41c22040d55cd67 Mon Sep 17 00:00:00 2001 From: Sol Jerome Date: Thu, 20 May 2010 18:30:06 +0000 Subject: reports: Fixes for Tickets #833 and #885 Signed-off-by: Sol Jerome git-svn-id: https://svn.mcs.anl.gov/repos/bcfg/trunk/bcfg2@5861 ce84e21b-d406-0410-9b95-82705330c041 --- src/lib/Server/Reports/reports/views.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'src/lib/Server/Reports/reports/views.py') diff --git a/src/lib/Server/Reports/reports/views.py b/src/lib/Server/Reports/reports/views.py index b9fa371ef..cb8dbe650 100644 --- a/src/lib/Server/Reports/reports/views.py +++ b/src/lib/Server/Reports/reports/views.py @@ -40,8 +40,8 @@ def config_item_modified(request, eyedee =None, timestamp = 'now', type=TYPE_MOD 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,7 +131,7 @@ def client_detailed_list(request, **kwargs): 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']: -- cgit v1.2.3-1-g7c22