diff --git a/profiles/admin.py b/profiles/admin.py index d00201908914d436c4e62a62e8e45a6275378b04..1206b601ec0dcc58204233c05918f630ae47e08e 100644 --- a/profiles/admin.py +++ b/profiles/admin.py @@ -13,6 +13,7 @@ class ProfileEmailInline(admin.TabularInline): class ProfileAdmin(admin.ModelAdmin): + list_display = ['__str__', 'email', 'discipline', 'expertises'] search_fields = ['first_name', 'last_name', 'emails__email', 'orcid_id'] inlines = [ProfileEmailInline] diff --git a/scipost/forms.py b/scipost/forms.py index 0528e03126ef3200f3d23a389b99347b82d3c6c9..7842937a222484423d9b718033c81e181e872840 100644 --- a/scipost/forms.py +++ b/scipost/forms.py @@ -610,7 +610,7 @@ class ContributorMergeForm(forms.Form): nom.in_disagreement.remove(contrib_from) nom.in_disagreement.add(contrib_into) # If both accounts were active, inform the Contributor of the merge - if both_contribs_active or True: + if both_contribs_active: mail_sender = DirectMailUtil( mail_code='contributors/inform_contributor_duplicate_accounts_merged', contrib_from=contrib_from)