Resolve merge conflicts

This commit is contained in:
Erin 2024-04-16 11:17:41 -07:00
commit cc312d1009
No known key found for this signature in database
GPG key ID: 1CAD275313C62460

View file

@ -683,6 +683,7 @@ class ContactAdmin(ListHeaderAdmin):
list_display = [
"name",
"email",
"user_exists",
]
# this ordering effects the ordering of results
# in autocomplete_fields for user
@ -699,7 +700,14 @@ class ContactAdmin(ListHeaderAdmin):
change_form_template = "django/admin/email_clipboard_change_form.html"
# We name the custom prop 'name' because linter
def user_exists(self, obj):
"""Check if the Contact has a related User"""
return "Yes" if obj.user is not None else "No"
user_exists.short_description = "Is user" # type: ignore
user_exists.admin_order_field = "user" # type: ignore
# We name the custom prop 'contact' because linter
# is not allowing a short_description attr on it
# This gets around the linter limitation, for now.
def name(self, obj: models.Contact):