diff --git a/apps/social/views.py b/apps/social/views.py index 86c062b73..ab8797b35 100644 --- a/apps/social/views.py +++ b/apps/social/views.py @@ -1226,7 +1226,7 @@ def find_friends(request): if results: email = results.group(0) profiles = MSocialProfile.objects.filter(email__iexact=email)[:limit] - if query.isdigit() and request.user.is_staff: + if not profiles and query.isdigit() and request.user.is_staff: profiles = MSocialProfile.objects.filter(user_id=int(query))[:limit] if not profiles: profiles = MSocialProfile.objects.filter(username__iexact=query)[:limit] diff --git a/utils/log.py b/utils/log.py index ddcbdceab..762b1d1ac 100644 --- a/utils/log.py +++ b/utils/log.py @@ -37,9 +37,9 @@ def user(u, msg, request=None, warn_color=True): seconds = time.time() - request.start_time color = '~FB' if warn_color: - if seconds >= 1: + if seconds >= 5: color = '~FR' - elif seconds > .2: + elif seconds > 1: color = '~SB~FK' time_elapsed = "[%s%.4ss~SB] " % ( color,