show activity stream entry for system auditor association

awx/main/models/__init__.py

@@ -142,10 +142,15 @@ def user_is_system_auditor(user):
 def user_is_system_auditor(user, tf):
     if user.id:
         if tf:
-            Role.singleton('system_auditor').members.add(user)
+            role = Role.singleton('system_auditor')
+            # must check if member to not duplicate activity stream
+            if user not in role.members.all():
+                role.members.add(user)
             user._is_system_auditor = True
         else:
-            Role.singleton('system_auditor').members.remove(user)
+            role = Role.singleton('system_auditor')
+            if user in role.members.all():
+                role.members.remove(user)
             user._is_system_auditor = False
 
 

awx/main/models/activity_stream.py

@@ -76,6 +76,11 @@ class ActivityStream(models.Model):
 
     setting = JSONField(blank=True)
 
+    def __str__(self):
+        operation = self.operation if 'operation' in self.__dict__ else '_delayed_'
+        timestamp = self.timestamp.isoformat() if 'timestamp' in self.__dict__ else '_delayed_'
+        return u'%s-%s-pk=%s' % (operation, timestamp, self.pk)
+
     def get_absolute_url(self, request=None):
         return reverse('api:activity_stream_detail', kwargs={'pk': self.pk}, request=request)