From 7a4122f088bec1a78f195e16bd0876b2dce24698 Mon Sep 17 00:00:00 2001
From: "J.-S. Caux" <J.S.Caux@uva.nl>
Date: Tue, 20 Nov 2018 16:14:33 +0100
Subject: [PATCH] Add is duplicate to User admin
---
scipost/admin.py | 7 ++++++-
scipost/models.py | 4 ++++
2 files changed, 10 insertions(+), 1 deletion(-)
diff --git a/scipost/admin.py b/scipost/admin.py
index 8678bee7b..5eeb7a855 100644
--- a/scipost/admin.py
+++ b/scipost/admin.py
@@ -41,9 +41,14 @@ class UserAdmin(UserAdmin):
ContactToUserInline,
ProductionUserInline
]
- list_display = ['username', 'email', 'first_name', 'last_name', 'is_active', 'is_staff']
+ list_display = ['username', 'email', 'first_name', 'last_name',
+ 'is_active', 'is_staff', 'is_duplicate']
search_fields = ['last_name', 'email']
+ def is_duplicate(self, obj):
+ return obj.contributor.is_duplicate
+ is_duplicate.short_description = 'Is duplicate?'
+ is_duplicate.boolean = True
admin.site.unregister(User)
admin.site.register(Contributor, ContributorAdmin)
diff --git a/scipost/models.py b/scipost/models.py
index 960c721d2..6fca155d7 100644
--- a/scipost/models.py
+++ b/scipost/models.py
@@ -93,6 +93,10 @@ class Contributor(models.Model):
"""
return self.user.is_active and self.status == NORMAL_CONTRIBUTOR
+ @property
+ def is_duplicate(self):
+ return self.duplicate_of is not None
+
@property
def is_currently_available(self):
"""Check if Contributor is currently not marked as unavailable."""
--
GitLab