From c528e3d96070fc2220baae0f2f840c577d0de19f Mon Sep 17 00:00:00 2001
From: Leo Franchi <leo@humbughq.com>
Date: Tue, 28 May 2013 09:31:58 -0400
Subject: [PATCH] Handle multiple users with the same fullname or shortname in
 @-completions

(imported from commit 3d60b657ae975e5dcdfc383f431eb8c8dee2c40a)
---
 zephyr/lib/actions.py | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

diff --git a/zephyr/lib/actions.py b/zephyr/lib/actions.py
index 95bac03bcf..f8c3802947 100644
--- a/zephyr/lib/actions.py
+++ b/zephyr/lib/actions.py
@@ -218,13 +218,11 @@ def mentioned_in_message(message):
         attempts = [Q(full_name__iexact=mention), Q(short_name__iexact=mention)]
         found = False
         for attempt in attempts:
-            try:
-                user = UserProfile.objects.get(attempt, realm=message.sender.realm)
+            ups = UserProfile.objects.filter(attempt, realm=message.sender.realm)
+            for user in ups:
                 users.add(user)
-                found = True
-                break
-            except UserProfile.DoesNotExist:
-                continue
+            found = len(ups) > 0
+            break
 
         if found:
             continue