From 50d9118b09fa4dc1e2c768809ddd71efd1721b2e Mon Sep 17 00:00:00 2001 From: Jussi Heikkila Date: Fri, 29 Jan 2016 16:47:58 +0200 Subject: [PATCH] do not return disabled userattributes --- authdata/views.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/authdata/views.py b/authdata/views.py index 5b98378..1353dab 100644 --- a/authdata/views.py +++ b/authdata/views.py @@ -114,7 +114,7 @@ def get(self, request, *args, **kwargs): if user_data is None: # queried user does not exist in the external source return Response(None) - for user_attribute in user_obj.attributes.all(): + for user_attribute in user_obj.attributes.filter(disabled_at__isnull=True): # Add attributes to user data user_data['attributes'].append({'name': user_attribute.attribute.name, 'value': user_attribute.value}) LOG.debug('/query returning data', extra={'data': {'user_data': repr(user_data)}}) @@ -131,7 +131,7 @@ def get(self, request, *args, **kwargs): # New users are created in data source user_obj = User.objects.get(username=user_data['username']) - for user_attribute in user_obj.attributes.all(): + for user_attribute in user_obj.attributes.filter(disabled_at__isnull=True): # Add attributes to user data user_data['attributes'].append({'name': user_attribute.attribute.name, 'value': user_attribute.value}) LOG.debug('/query returning data', extra={'data': {'user_data': repr(user_data)}})