Link IndividualMember to user profile page #2277

ertgl · 2025-10-20T02:12:44Z

This PR relates to both #1738 and #2243, and includes the following works.

Add bio field to accounts.Profile model.
Fix a styling bug where the floating image causes a vertical space between words in the name, by its own height, on small screen sizes or for long names.
Display Individual Members' names as links to their profile pages when associated to a user.
Add admin action to send account invite mail to individual members.
4.1. Create custom permission send_account_invite_mail on IndividualMember model.
4.2. Add field account_invite_mail_sent_at to prevent duplicated mails.
4.3. Prevent potential race-conditions and duplications, using select_for_update(nowait=False) and inner savepoints.
4.4 Add filters to the admin page so users can see an overview of the current state.

Screenshots are included below.

Image 1: Profile page

Image 2: Profile page (responsive)

Image 3: Profile edit form

Image 4: Vertical space between words caused by the floating image

Image 5: Links in the Individual Members list

Image 6: Links in the Former Individual Members list

Image 7: Optional user field on IndividualMember admin page

Image 8: Auto-completable user field on IndividualMember admin page

Image 9: Admin action to send account invite mail to individual members

Image 10: Messages to show the results after running the action

Additional Notes

Currently, no maxlength specified for the bio field on the update form.
We allow users to edit their names (user.profile.name), but in the Individual Members list, we display names from memberships (member.name).
It is not apparent from the user's profile that they are an individual member (e.g., via a badge).

Fixes #1738 and fixes #2243

…`AUTH_USER_MODEL`

…ciated with a user

for more information, see https://pre-commit.ci

…late changes

for more information, see https://pre-commit.ci

ertgl · 2025-10-21T03:16:17Z

Next steps:

Ensure the subject and content of the account invite email are good.
- Subject: members/models.py#L109
- Content: djangoproject/templates/members/email/account_invite.txt
Set the default sender address for send_mail in djangoproject/settings/common.py#L57
- Check whether the foundation also wants the emails sent to that sender address (as seen here: members/forms.py#L120).

Additional screenshots:

Image 11: Account invite mail

sarahboyce

This is a great start thank you @ertgl for picking this up!
I would add a few more tests and I have some initial comments 👍

sarahboyce · 2025-10-21T08:21:53Z

djangoproject/templates/accounts/user_profile.html


+        {% if user_obj.profile.bio %}
+            <p class="bio">
+                {{ user_obj.profile.bio }}


I think given you wanted to add links it might be nice to use urlize here. I also think we should have a character limit on the bio, something like 3,000 characters 🤔
A different thought was whether we would let folks use markdown but maybe let's keep it simple

I agree that using urlize would be nice. So, both that this PR wouldn't get bigger and you can start collecting feedback from members sooner and decide later whether to support Markdown. If my contribution would be helpful, I'd be happy to implement it as well at any time.

This has been done, but let's not mark it as resolved yet. I'll add tests for this.

Screen.Recording.2025-10-22.at.03.44.29.mov

OK. I've added tests for this (hopefully everything is covered).

sarahboyce · 2025-10-21T08:24:07Z

djangoproject/templates/members/email/account_invite.txt

+
+We're updating the Django Individual Members list so each member's name can link to their djangoproject.com profile. On your profile, you can share a short bio, highlight your contributions to Django or the community, and provide ways for others to get in touch.
+
+To have your name linked, please create an account (if you don't already have one) at:


I wonder if it's worth mentioning that their account name should match their github username if they use their github account for Trac. This let's us show stats about their contributions in their profile page

Oh, thank you! That's something I wasn't aware of. I'll work on it. Additionally, I've checked the code and I'm thinking that we could provide another optional input to let user override the parameter passed to trac_stats.get_user_stats(username) function (also by displaying the username that overrides the user.username, on the page). Do you think these would be useful?

I'm not sure as I guess folks could try to claim the stats of others as their own 🤔

You're right, displaying the username on the page wouldn't be enough. What if we put the input to the admin only instead, and mention in the email that if they have a mismatch they can request a fix?

Sure that's an idea 👍

I've done the following:

Add trac_username field to Profile.

Add ProfileAdmin class to allow overriding Trac username for a specific user (for retrieving stats).

Add a utility function get_user_trac_username, to be used as a single source of truth.

Refactor the profile view to use the function for retrieving the stats.

Add test to verify that usernames can be overridden.

Add another test to ensure trac_username field is not included by the publicly used ProfileForm.

Add note about usernames to the email (but I didn't mention yet that it can be overridden when needed).

Additional screenshots:

Image 12: Profiles - admin page

Image 13: Update profile - admin page

I've refactored the profile view to prevent rendering false Trac stats in certain situations. Here's the step-by-step details:

If the user has a trac_username set, this indicates a verified username, so retrieve and render the stats for that specific trac_username.

Otherwise, check if the user's username is used as trac_username by another user. If so, prevent rendering the stats.

Otherwise, retrieve and render the stats for the user's username.

All in a cached way.

Since Profile.trac_username field is not unique, this can also tolerate rare/temporal cases where multiple accounts belong to the same person and share the same trac_username.

Please feel free to let me know if anything should be handled differently.

sarahboyce · 2025-10-21T08:32:49Z

members/migrations/0010_individualmember_user.py

+        migrations.AddField(
+            model_name="individualmember",
+            name="user",
+            field=models.OneToOneField(


As an idea, we could have a custom migration which links existing IndividualMember and User based off matching emails 🤔

That's done too. I also made it reusable to handle occasional stale states by adding a management command.

ertgl · 2025-10-21T09:31:46Z

Thank you @sarahboyce! I appreciate your review and feedback. I'll add the additional tests and take your comments into account.

bmispelon · 2025-10-21T19:39:14Z

members/admin.py

+            self.message_user(
+                request,
+                ngettext(
+                    "Sent account invite mail to 1 individual member.",


Just a quick drive-by comment to say that:

I love this PR, thanks so much for working on it! 💚

When using ngettext, you should still be using %(count)d in the first argument (this is because some languages use the singular form for amounts other than 1):

Suggested change

"Sent account invite mail to 1 individual member.",

"Sent account invite mail to %(count)d individual member.",

You're absolutely right! I missed that detail, and I'll fix it accordingly. Thanks so much for catching it and for the kind words. 💚

OK! I've fixed it.

…ails) 1. Implement `BoundFieldWithCharacterCounter` to add character counter specific data to any `CharField` inputs. 2. Implement character counter in JavaScript so we can enhance the page progressively. 3. Make `ProfileForm.bio` field use `BoundFieldWithCharacterCounter`. 4. Set maxlength for `ProfileForm.bio` field. 5. Render `profile.bio` with `urlize` to convert URLs and mail addresses in the plaintext into clickable links. Co-authored-by: Sarah Boyce <[email protected]>

for more information, see https://pre-commit.ci

…uages Co-authored-by: Baptiste Mispelon <[email protected]>

Co-authored-by: Sarah Boyce <[email protected]>

…ldWithCharacterCounter.get_characters_remaining_count` method

…nts race-conditions

for more information, see https://pre-commit.ci

…ac stats

… for details) - Add `accounts.Profile.trac_username` field. - Add `ProfileAdmin` to enable overriding Trac username for a specific user. - Refactor `user_profile` view to use `get_trac_username` function. Co-authored-by: Sarah Boyce <[email protected]>

for more information, see https://pre-commit.ci

djangoproject/settings/common.py

members/models.py

…account_invite_mails_prevents_race_condition`

…ype of stats

…t-invite mail's recipients

…te_mails`

…ng_matches_client_side_js_implementation`

…another user in a verified way

…eck_if_user_username_is_used_as_trac_username_by_another_user`

ertgl and others added 13 commits October 20, 2025 01:51

Add bio field to accounts.Profile model

bb10b9c

Apply black to migrations

2c29158

Add a nullable one-to-one user field linking IndividualMember to …

093ed87

…`AUTH_USER_MODEL`

Display IndividualMember names as links to their profiles when asso…

8b918c0

…ciated with a user

Fix vertical split of profile name caused by floated image

6e90cd5

Make the user field on IndividualMemberAdmin auto-completable

6a2322d

[pre-commit.ci] auto fixes from pre-commit.com hooks

a55a0f5

for more information, see https://pre-commit.ci

Update UserProfileTests.test_username_is_page_title to reflect temp…

9a180f1

…late changes

Add profile link tests for current and former individual members

a352eda

Add admin action to send account invite mail to individual members

36b3f90

[pre-commit.ci] auto fixes from pre-commit.com hooks

b7ad21f

for more information, see https://pre-commit.ci

Fix Flake8 E501 (line too long) errors

da706a4

[pre-commit.ci] auto fixes from pre-commit.com hooks

d4d8873

for more information, see https://pre-commit.ci

ertgl marked this pull request as ready for review October 21, 2025 03:19

sarahboyce reviewed Oct 21, 2025

View reviewed changes

bmispelon reviewed Oct 21, 2025

View reviewed changes

ertgl and others added 6 commits October 22, 2025 03:56

[pre-commit.ci] auto fixes from pre-commit.com hooks

e46a504

for more information, see https://pre-commit.ci

Fix ngettext usages to correctly handle singular forms for all lang…

f1a4781

…uages Co-authored-by: Baptiste Mispelon <[email protected]>

Add management command send_individual_member_account_invite_mails

20117b6

Add management command link_individual_members_to_users_by_email

84c0826

Add migration that links individual members to users by email

bc0467e

Co-authored-by: Sarah Boyce <[email protected]>

ertgl force-pushed the issue/1738 branch from 9f68fae to bc0467e Compare October 22, 2025 07:49

ertgl added 5 commits October 23, 2025 00:35

Add tests for displaying user bio in profile

7365e8b

Convert contrib.django.forms module into an app for testing

46cb8cd

Add note to describe why we need value normalization in the `BoundFie…

a69e9e1

…ldWithCharacterCounter.get_characters_remaining_count` method

Add tests for BoundFieldWithCharacterCounter class

85c211d

Add tests for edit_profile view

65950f7

ertgl and others added 13 commits October 23, 2025 03:25

Add test for IndividualMember.match_and_set_users_by_email classmethod

9fc7fd1

Add test for IndividualMember.send_account_invite_mails classmethod

bb963f6

Add test for IndividualMember.send_account_invite_mail method

2588d94

Fix Flake8 F541 (f-string is missing placeholders) error

94ba067

Add test to verify IndividualMember.send_account_invite_mails preve…

81d7137

…nts race-conditions

[pre-commit.ci] auto fixes from pre-commit.com hooks

db9a7dd

for more information, see https://pre-commit.ci

Reduce resource usage of some tests

aa9d1cb

Add note to account-invite mail about matching GitHub username for Tr…

f37e3f8

…ac stats

Update subject of Individual Membership account-invite mail

ef54d5b

Rename get_trac_username to get_user_trac_username

f922710

[pre-commit.ci] auto fixes from pre-commit.com hooks

a0f2d47

for more information, see https://pre-commit.ci

Fix Flake8 F401 (imported but unused) error

b91a2a0

ertgl commented Oct 23, 2025

View reviewed changes

djangoproject/settings/common.py Outdated Show resolved Hide resolved

members/models.py Outdated Show resolved Hide resolved

ertgl added 11 commits October 24, 2025 01:41

Reduce resource usage of `IndividualMemberTransactionTests.test_send_…

26eed00

…account_invite_mails_prevents_race_condition`

Add tests to ensure overriding user's Trac username works for every t…

c9cc83e

…ype of stats

Remove the 'noreply' sender address from the individual member accoun…

a8984d5

…t-invite mail's recipients

Format code

4725cfa

Add tests for management command `send_individual_member_account_invi…

5b67032

…te_mails`

Remove unnecessary test test_trac_username_overrides_user_username

a42b481

Fix test `BoundFieldWithCharacterCounterTests.test_characters_remaini…

58ed3bc

…ng_matches_client_side_js_implementation`

Prevent rendering Trac stats for a user when the username is used by …

29c77ed

…another user in a verified way

Fix Flake8 F401 (imported but unused) error

e13bd18

Rename check_if_trac_username_is_overridden_for_another_user to `ch…

f314007

…eck_if_user_username_is_used_as_trac_username_by_another_user`

Move code block inside if to prevent unnecessary execution

86d44c4


		We're updating the Django Individual Members list so each member's name can link to their djangoproject.com profile. On your profile, you can share a short bio, highlight your contributions to Django or the community, and provide ways for others to get in touch.

		To have your name linked, please create an account (if you don't already have one) at:

	"Sent account invite mail to 1 individual member.",
	"Sent account invite mail to %(count)d individual member.",

Uh oh!

Link IndividualMember to user profile page #2277

Are you sure you want to change the base?

Link IndividualMember to user profile page #2277

Conversation

ertgl commented Oct 20, 2025 • edited by sarahboyce Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Additional Notes

Uh oh!

ertgl commented Oct 21, 2025

Uh oh!

sarahboyce left a comment

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

ertgl Oct 22, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

ertgl Oct 23, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

ertgl commented Oct 21, 2025

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

3 participants

ertgl commented Oct 20, 2025 •

edited by sarahboyce

Loading

ertgl Oct 22, 2025 •

edited

Loading

ertgl Oct 23, 2025 •

edited

Loading