summaryrefslogtreecommitdiffstats
path: root/src/lib/Server/Reports/reports
diff options
context:
space:
mode:
authorTim Laszlo <tim.laszlo@gmail.com>2010-05-28 19:44:53 +0000
committerSol Jerome <solj@ices.utexas.edu>2010-06-01 21:29:42 -0500
commitb1a72cc048608735dae304630ec8f1ba0f0772e3 (patch)
tree437baddc9beb252cc4105066a69ffd68a1e6723f /src/lib/Server/Reports/reports
parent5dab8751545bde68f3eafe8f9db0e992f4e56e5a (diff)
downloadbcfg2-b1a72cc048608735dae304630ec8f1ba0f0772e3.tar.gz
bcfg2-b1a72cc048608735dae304630ec8f1ba0f0772e3.tar.bz2
bcfg2-b1a72cc048608735dae304630ec8f1ba0f0772e3.zip
Assoicated elements only displays current element
git-svn-id: https://svn.mcs.anl.gov/repos/bcfg/trunk/bcfg2@5871 ce84e21b-d406-0410-9b95-82705330c041
Diffstat (limited to 'src/lib/Server/Reports/reports')
-rw-r--r--src/lib/Server/Reports/reports/views.py6
1 files 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 = []