Skip to content

[ENG-9913] Return mergerer page in case user was merged into another account #11486

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
ihorsokhanexoft wants to merge 1 commit into
base: master
Choose a base branch
from
+5 −0
Open

[ENG-9913] Return mergerer page in case user was merged into another account #11486

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions api/users/serializers.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -103,6 +103,7 @@ class UserSerializer(JSONAPISerializer):
{
'html': 'absolute_url',
'profile_image': 'profile_image_url',
'merged_by': 'get_merged_by_absolute_url',
},
),
)
Expand Down Expand Up @@ -240,6 +241,10 @@ def get_default_region_id(self, obj):
def get_accepted_terms_of_service(self, obj):
return bool(obj.accepted_terms_of_service)

def get_merged_by_absolute_url(self, obj):
if obj.merged_by:
return obj.merged_by.absolute_url

def profile_image_url(self, user):
size = self.context['request'].query_params.get('profile_image_size')
return user.profile_image_url(size=size)
Expand Down
Loading