paulmataruso/zulip
1
0
Fork 0
mirror of https://github.com/zulip/zulip.git synced 2025-11-04 05:53:43 +00:00
Code Issues Packages Projects Releases Wiki Activity

support: Allow user look up through full name search.

Browse Source
This commit is contained in:
Vishnu KS
2020-10-31 00:53:20 +05:30
committed by Tim Abbott
parent 9359dee75b
commit dd5bcb97e8
3 changed files with 21 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
analytics/tests/test_views.py
View File

@@ -440,6 +440,11 @@ class TestSupportEndpoint(ZulipTestCase):
'class="copy-button" data-copytext="desdemona@zulip.com, iago@zulip.com"',
], result)
def check_othello_user_query_result(result: HttpResponse) -> None:
self.assert_in_success_response(['<span class="label">user</span>\n', '<h3>Othello, the Moor of Venice</h3>',
'<b>Email</b>: othello@zulip.com', '<b>Is active</b>: True<br>'
], result)
def check_zulip_realm_query_result(result: HttpResponse) -> None:
zulip_realm = get_realm("zulip")
self.assert_in_success_response([f'<input type="hidden" name="realm_id" value="{zulip_realm.id}"',
@@ -544,6 +549,15 @@ class TestSupportEndpoint(ZulipTestCase):
check_zulip_realm_query_result(result)
check_lear_realm_query_result(result)
result = self.client_get("/activity/support", {"q": "King hamlet,lear"})
check_hamlet_user_query_result(result)
check_zulip_realm_query_result(result)
check_lear_realm_query_result(result)
result = self.client_get("/activity/support", {"q": "Othello, the Moor of Venice"})
check_othello_user_query_result(result)
check_zulip_realm_query_result(result)
result = self.client_get("/activity/support", {"q": "lear, Hamlet <hamlet@zulip.com>"})
check_hamlet_user_query_result(result)
check_zulip_realm_query_result(result)

8
analytics/views.py
View File

@@ -1200,7 +1200,7 @@ def support(request: HttpRequest) -> HttpResponse:
if query:
key_words = get_invitee_emails_set(query)
context["users"] = UserProfile.objects.filter(delivery_email__in=key_words)
users = set(UserProfile.objects.filter(delivery_email__in=key_words))
realms = set(Realm.objects.filter(string_id__in=key_words))
for key_word in key_words:
@@ -1217,7 +1217,7 @@ def support(request: HttpRequest) -> HttpResponse:
except Realm.DoesNotExist:
pass
except ValidationError:
pass
users.update(UserProfile.objects.filter(full_name__iexact=key_word))
for realm in realms:
realm.customer = get_customer_by_realm(realm)
@@ -1233,6 +1233,10 @@ def support(request: HttpRequest) -> HttpResponse:
realm.current_plan.licenses = last_ledger_entry.licenses
realm.current_plan.licenses_used = get_latest_seat_count(realm)
# full_names can have , in them
users.update(UserProfile.objects.filter(full_name__iexact=query))
context["users"] = users
context["realms"] = realms
confirmations: List[Dict[str, Any]] = []

2
templates/analytics/support.html
View File

@@ -12,7 +12,7 @@
<br>
<form class="new-style">
<center>
<input type="text" name="q" class="input-xxlarge search-query" placeholder="emails, string_ids, organization URLs separated by commas" value="{{ request.GET.get('q', '') }}" autofocus>
<input type="text" name="q" class="input-xxlarge search-query" placeholder="full names, emails, string_ids, organization URLs separated by commas" value="{{ request.GET.get('q', '') }}" autofocus>
<button type="submit" class="button small support-search-button">Search</button>
</center>
</form>