From b1a72cc048608735dae304630ec8f1ba0f0772e3 Mon Sep 17 00:00:00 2001 From: Tim Laszlo Date: Fri, 28 May 2010 19:44:53 +0000 Subject: Assoicated elements only displays current element git-svn-id: https://svn.mcs.anl.gov/repos/bcfg/trunk/bcfg2@5871 ce84e21b-d406-0410-9b95-82705330c041 --- src/lib/Server/Reports/reports/views.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/lib/Server/Reports/reports/views.py b/src/lib/Server/Reports/reports/views.py index cb8dbe650..9e7dee77a 100644 --- a/src/lib/Server/Reports/reports/views.py +++ b/src/lib/Server/Reports/reports/views.py @@ -29,8 +29,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_client.current_interaction_id = reports_entries_interactions.interaction_id "+ "AND reports_entries_interactions.interaction_id = reports_interaction.id "+ - "AND reports_entries_interactions.id = %s " + - "AND reports_entries_interactions.type = %s", [eyedee, type]) + "AND reports_entries_interactions.entry_id = %s " + + "AND reports_entries_interactions.reason_id = %s", [item.entry.id, item.reason.id]) associated_client_list = Client.objects.active(timestamp).filter(id__in=[x[0] for x in cursor.fetchall()]) else: interact_queryset = Interaction.objects.interaction_per_client(timestamp) @@ -41,7 +41,7 @@ def config_item_modified(request, eyedee =None, timestamp = 'now', type=TYPE_MOD "WHERE reports_entries_interactions.interaction_id IN %s "+ "AND reports_entries_interactions.interaction_id = reports_interaction.id "+ "AND reports_entries_interactions.entry_id = %s " + - "AND reports_entries_interactions.type = %s ", [interactionlist, item.entry_id, type]) + "AND reports_entries_interactions.reason_id = %s ", [interactionlist, item.entry_id, item.reason.id]) associated_client_list = Client.objects.active(timestamp).filter(id__in=[x[0] for x in cursor.fetchall()]) else: associated_client_list = [] -- cgit v1.2.3-1-g7c22