From 9e8459b96a38e4a7051d31e3bb19ff31e2c8eb4c Mon Sep 17 00:00:00 2001 From: Matthew Jones Date: Thu, 14 Nov 2013 13:28:13 -0500 Subject: [PATCH] Improve loading time for some module calls by reducing the number of queries against the activity stream table --- awx/main/middleware.py | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/awx/main/middleware.py b/awx/main/middleware.py index 4906bfea26..87959af432 100644 --- a/awx/main/middleware.py +++ b/awx/main/middleware.py @@ -39,11 +39,12 @@ class ActivityStreamMiddleware(object): return response def set_actor(self, user, sender, instance, **kwargs): - if sender == ActivityStream: - if isinstance(user, User) and instance.user is None: - instance.user = user - elif not self.finished: - self.isActivityStreamEvent = True - self.instances.append(instance) - else: + if not self.finished: + if sender == ActivityStream: + if isinstance(user, User) and instance.user is None: + instance.user = user + else: + self.isActivityStreamEvent = True + self.instances.append(instance) + else: self.isActivityStreamEvent = False