From 9c5ab854a6cd54d5d0ba6da6f2e24d8cdfa858ad Mon Sep 17 00:00:00 2001
From: "J.-S. Caux" <J.S.Caux@uva.nl>
Date: Sat, 17 Nov 2018 19:07:41 +0100
Subject: [PATCH] Remove testing bool; improve Profiles admin
---
profiles/admin.py | 1 +
scipost/forms.py | 2 +-
2 files changed, 2 insertions(+), 1 deletion(-)
diff --git a/profiles/admin.py b/profiles/admin.py
index d00201908..1206b601e 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 0528e0312..7842937a2 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)
--
GitLab