Link IndividualMember to user profile page

Makefile

@@ -1,6 +1,6 @@
 .PHONY: all ci clean collectstatics compile-scss compile-scss-debug install run test watch-scss
 
-APP_LIST ?= accounts aggregator blog contact dashboard djangoproject docs foundation fundraising legacy members releases svntogit tracdb
+APP_LIST ?= accounts aggregator blog contact contrib.django.forms dashboard djangoproject docs foundation fundraising legacy members releases svntogit tracdb
 SCSS = djangoproject/scss
 STATIC = djangoproject/static
 

accounts/admin.py

@@ -0,0 +1,31 @@
+from django import forms
+from django.contrib import admin
+
+from .forms import ProfileForm
+from .models import Profile
+
+
+class ProfileAdminForm(forms.ModelForm):
+    class Meta:
+        model = Profile
+        fields = "__all__"
+
+    def __init__(self, *args, **kwargs):
+        super().__init__(*args, **kwargs)
+        self.fields["bio"].widget.attrs["maxlength"] = ProfileForm.base_fields[
+            "bio"
+        ].max_length
+        self.fields["bio"].help_text = ProfileForm.base_fields["bio"].help_text
+
+
+@admin.register(Profile)
+class ProfileAdmin(admin.ModelAdmin):
+    list_display = [
+        "user__username",
+        "name",
+        "trac_username",
+    ]
+    list_select_related = ["user"]
+    search_fields = ["user__username", "name", "trac_username"]
+    form = ProfileAdminForm
+    autocomplete_fields = ["user"]

accounts/forms.py

@@ -3,6 +3,8 @@
 from django.db.models import ProtectedError
 from django.utils.translation import gettext_lazy as _
 
+from contrib.django.forms.boundfields import BoundFieldWithCharacterCounter
+
 from .models import Profile
 
 
@@ -20,10 +22,19 @@ class ProfileForm(forms.ModelForm):
     email = forms.EmailField(
         required=False, widget=forms.TextInput(attrs={"placeholder": _("Email")})
     )
+    bio = forms.CharField(
+        bound_field_class=BoundFieldWithCharacterCounter,
+        required=False,
+        max_length=3_000,
+        widget=forms.Textarea(attrs={"placeholder": _("Bio")}),
+        help_text=_(
+            "URLs and email addresses are automatically converted into clickable links.",
+        ),
+    )
 
     class Meta:
         model = Profile
-        fields = ["name"]
+        fields = ["name", "bio"]
 
     def __init__(self, *args, **kwargs):
         instance = kwargs.get("instance", None)

accounts/migrations/0003_profile_bio.py

@@ -0,0 +1,18 @@
+# Generated by Django 5.2.7 on 2025-10-19 01:39
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ("accounts", "0002_migrate_sha1_passwords"),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name="profile",
+            name="bio",
+            field=models.TextField(blank=True),
+        ),
+    ]

accounts/migrations/0004_profile_trac_username.py

@@ -0,0 +1,20 @@
+# Generated by Django 5.2.7 on 2025-10-22 23:07
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ("accounts", "0003_profile_bio"),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name="profile",
+            name="trac_username",
+            field=models.CharField(
+                blank=True, db_index=True, default="", max_length=150
+            ),
+        ),
+    ]

accounts/models.py

@@ -5,6 +5,14 @@
 class Profile(models.Model):
     user = models.OneToOneField(User, on_delete=models.CASCADE)
     name = models.CharField(max_length=200, blank=True)
+    bio = models.TextField(blank=True)
+    trac_username = models.CharField(
+        max_length=150,
+        blank=True,
+        null=False,
+        default="",
+        db_index=True,
+    )
 
     def __str__(self):
         return self.name or str(self.user)

accounts/tests.py

@@ -1,30 +1,107 @@
 import hashlib
+from random import randint
 
 from django.contrib.auth.models import AnonymousUser, User
 from django.core.cache import cache
-from django.test import TestCase, override_settings
+from django.test import RequestFactory, TestCase, override_settings
 from django_hosts.resolvers import reverse
 
 from accounts.forms import DeleteProfileForm
+from accounts.models import Profile
 from foundation import models as foundationmodels
 from tracdb.models import Revision, Ticket, TicketChange
 from tracdb.testutils import TracDBCreateDatabaseMixin
 
+from .forms import ProfileForm
+from .views import edit_profile
+
 
 @override_settings(TRAC_URL="https://code.djangoproject.com/")
 class UserProfileTests(TracDBCreateDatabaseMixin, TestCase):
     databases = {"default", "trac"}
 
     @classmethod
     def setUpTestData(cls):
-        User.objects.create_user(username="user1", password="password")
-        User.objects.create_user(username="user2", password="password")
+        user1_bio = "\n".join(
+            [
+                "[pre]",
+                "\n",
+                "Email: [email protected]",
+                "Website: user1.example.com",
+                "GitHub: https://github.com/ghost",
+                "\n",
+                "[post]",
+            ],
+        )
+        user2_bio = ""
+        user1 = User.objects.create_user(username="user1", password="password")
+        user2 = User.objects.create_user(username="user2", password="password")
+        Profile.objects.create(user=user1, bio=user1_bio)
+        Profile.objects.create(user=user2, bio=user2_bio)
         cls.user1_url = reverse("user_profile", args=["user1"])
         cls.user2_url = reverse("user_profile", args=["user2"])
 
     def test_username_is_page_title(self):
         response = self.client.get(self.user1_url)
-        self.assertContains(response, "<h1>user1</h1>", html=True)
+        self.assertContains(response, '<h1 class="name">user1</h1>', html=True)
+
+    def test_page_displays_bio_when_present(self):
+        response = self.client.get(self.user1_url)
+        self.assertContains(response, '<p class="bio">')
+
+    def test_page_hides_bio_when_absent(self):
+        response = self.client.get(self.user2_url)
+        self.assertNotContains(response, '<p class="bio">')
+
+    def test_bio_contains_mail_addresses_clickable(self):
+        response = self.client.get(self.user1_url)
+        self.assertContains(
+            response,
+            '<a href="mailto:[email protected]">[email protected]</a>',
+            html=True,
+        )
+
+    def test_bio_contains_links_without_protocol_clickable(self):
+        response = self.client.get(self.user1_url)
+        self.assertContains(
+            response,
+            (
+                '<a href="http://user1.example.com" rel="nofollow">'
+                "user1.example.com</a>"
+            ),
+            html=True,
+        )
+
+    def test_bio_contains_links_with_protocol_clickable(self):
+        response = self.client.get(self.user1_url)
+        self.assertContains(
+            response,
+            (
+                '<a href="https://github.com/ghost" rel="nofollow">'
+                "https://github.com/ghost</a>"
+            ),
+            html=True,
+        )
+
+    def test_trac_username_overrides_user_username(self):
+        djangoproject_username = "djangoproject_user"
+        trac_username = "trac_user"
+        user = User.objects.create_user(username=djangoproject_username)
+        Profile.objects.create(user=user, trac_username=trac_username)
+        Revision.objects.create(
+            author=trac_username,
+            rev="91c879eda595c12477bbfa6f51115e88b75ddf88",
+            _time=1731669560,
+        )
+
+        user_profile_url = reverse("user_profile", args=[djangoproject_username])
+        user_profile_response = self.client.get(user_profile_url)
+        self.assertContains(
+            user_profile_response,
+            '<a href="https://github.com/django/django/commits/main/'
+            f'?author={trac_username}">Commits: 1.</a>',
+            html=True,
+        )
 
     def test_stat_commits(self):
         Revision.objects.create(
@@ -111,25 +188,25 @@ def test_stat_tickets_triaged(self):
             author="user1",
             newvalue="Accepted",
             ticket=Ticket.objects.create(),
-            **initial_ticket_values
+            **initial_ticket_values,
         )
         TicketChange.objects.create(
             author="user1",
             newvalue="Someday/Maybe",
             ticket=Ticket.objects.create(),
-            **initial_ticket_values
+            **initial_ticket_values,
         )
         TicketChange.objects.create(
             author="user1",
             newvalue="Ready for checkin",
             ticket=Ticket.objects.create(),
-            **initial_ticket_values
+            **initial_ticket_values,
         )
         TicketChange.objects.create(
             author="user2",
             newvalue="Accepted",
             ticket=Ticket.objects.create(),
-            **initial_ticket_values
+            **initial_ticket_values,
         )
 
         response = self.client.get(self.user1_url)
@@ -145,13 +222,13 @@ def test_stat_tickets_triaged_unaccepted_not_counted(self):
             oldvalue="Unreviewed",
             newvalue="Accepted",
             ticket=Ticket.objects.create(),
-            **common_ticket_values
+            **common_ticket_values,
         )
         TicketChange.objects.create(
             oldvalue="Accepted",
             newvalue="Unreviewed",
             ticket=Ticket.objects.create(),
-            **common_ticket_values
+            **common_ticket_values,
         )
 
         response = self.client.get(self.user1_url)
@@ -166,7 +243,7 @@ def test_stat_tickets_triaged_unaccepted_not_counted(self):
         }
     )
     def test_caches_trac_stats(self):
-        key = "user_vital_status:%s" % hashlib.md5(b"user1").hexdigest()
+        key = "trac_user_vital_status:%s" % hashlib.md5(b"user1").hexdigest()
 
         self.assertIsNone(cache.get(key))
 
@@ -175,6 +252,54 @@ def test_caches_trac_stats(self):
         self.assertIsNotNone(cache.get(key))
 
 
+class UserProfileUpdateFormTests(TestCase):
+    def setUp(self):
+        self.request_factory = RequestFactory()
+        self.edit_profile_url = reverse("edit_profile")
+
+    def test_trac_username_field_is_excluded(self):
+        form = ProfileForm()
+        self.assertNotIn(
+            "trac_username",
+            form.fields,
+            (
+                "`ProfileForm` includes the field `trac_username`."
+                " This may lead to security vulnerabilities."
+            ),
+        )
+
+    def test_bio_field_has_max_length(self):
+        form = ProfileForm()
+        self.assertIsInstance(form.fields["bio"].max_length, int)
+
+    def test_page_shows_characters_remaining_count_for_bio(self):
+        profile_edit_form = ProfileForm()
+        bio_field = profile_edit_form.fields["bio"]
+        bio_length = randint(0, max(bio_field.max_length, 20))
+        bio = "*" * bio_length
+        expected_characters_remaining_count = bio_field.max_length - bio_length
+        self.assertGreaterEqual(expected_characters_remaining_count, 0)
+        user = User.objects.create_user(username="user", password="password")
+        Profile.objects.create(user=user, bio=bio)
+        request = self.request_factory.get(self.edit_profile_url)
+        request.user = user
+        response = edit_profile(request)
+        self.assertContains(
+            response,
+            "<span>Characters remaining:</span>",
+            html=True,
+        )
+        self.assertContains(
+            response,
+            f"""
+                                class="character-counter__indicator"
+                            >
+                                {expected_characters_remaining_count}
+                            </span>
+            """.strip(),
+        )
+
+
 class ViewsTests(TestCase):
 
     def test_login_redirect(self):

accounts/views.py

@@ -8,6 +8,7 @@
 from django.shortcuts import get_object_or_404, redirect, render
 
 from tracdb import stats as trac_stats
+from tracdb.utils import get_user_trac_username
 
 from .forms import DeleteProfileForm, ProfileForm
 from .models import Profile
@@ -72,11 +73,12 @@ def delete_profile_success(request):
 
 
 def get_user_stats(user):
-    username = user.username.encode("ascii", "ignore")
-    key = "user_vital_status:%s" % hashlib.md5(username).hexdigest()
+    trac_username = get_user_trac_username(user)
+    encoded_trac_username = trac_username.encode("ascii", "ignore")
+    key = "trac_user_vital_status:%s" % hashlib.md5(encoded_trac_username).hexdigest()
     info = cache.get(key)
     if info is None:
-        info = trac_stats.get_user_stats(user.username)
+        info = trac_stats.get_user_stats(trac_username)
         # Hide any stat with a value = 0 so that we don't accidentally insult
         # non-contributors.
         for k, v in list(info.items()):

contrib/django/forms/apps.py

@@ -0,0 +1,6 @@
+from django.apps import AppConfig
+
+
+class FormsContribConfig(AppConfig):
+    label = "forms_contrib"
+    name = "contrib.django.forms"