Bach Dániel · @bachdaniel · Őry Máté · Őry Máté · Bach Dániel · Bach Dániel
--- a/circle/dashboard/autocomplete_light_registry.py
+++ b/circle/dashboard/autocomplete_light_registry.py
-    def choice_html(self, choice):
+    def highlight(self, field, q, none_wo_match=True):
+        if not field:
+            return None
        try:
-            name = choice.get_full_name()
-        except AttributeError:
-            name = _('group')
-        if name:
-            name = u'(%s)' % name
+            match = field.lower().index(q.lower())
+        except ValueError:
+            match = None
+        if q and match is not None:
+            match_end = match + len(q)
+            return (field[:match] + '<span class="autocomplete-hl">' +
--- a/circle/dashboard/autocomplete_light_registry.py
+++ b/circle/dashboard/autocomplete_light_registry.py
+            return None if none_wo_match else field
+
+    def choice_displayed_text(self, choice):
+        q = unicode(self.request.GET.get('q', ''))
+        name = self.highlight(unicode(choice), q, False)
+        if isinstance(choice, User):
+            extra_fields = [self.highlight(choice.get_full_name(), q, False),
+                            self.highlight(choice.email, q)]
+            try:
+                extra_fields.append(self.highlight(choice.profile.org_id, q))
+            except Profile.DoesNotExist:
+                pass
+            return '%s (%s)' % (name, ', '.join(f for f in extra_fields
+                                                if f))
+        else:
+            return '%s (%s)' % (name, _('group'))