From aea35b58aab81def3a3d88f2f646fdeed49e1171 Mon Sep 17 00:00:00 2001
From: Jonas Braathen <jonas.braathen@usit.uio.no>
Date: Tue, 31 Aug 2021 13:07:22 +0200
Subject: [PATCH] Add a few more __str__ methods to models.
Issue: GREG-26
---
greg/models.py | 12 ++++++++++++
1 file changed, 12 insertions(+)
diff --git a/greg/models.py b/greg/models.py
index 224d8273..89b98116 100644
--- a/greg/models.py
+++ b/greg/models.py
@@ -126,6 +126,9 @@ class RoleType(BaseModel):
description_en = models.TextField()
default_duration_days = models.IntegerField(null=True)
+ def __str__(self):
+ return "{} ({})".format(str(self.name_en or self.name_nb), self.identifier)
+
def __repr__(self):
return "{}(pk={!r}, identifier={!r}, name_nb={!r}, name_en={!r})".format(
self.__class__.__name__,
@@ -250,6 +253,9 @@ class ConsentType(BaseModel):
valid_from = models.DateField(default=date.today)
user_allowed_to_change = models.BooleanField()
+ def __str__(self):
+ return "{} ({})".format(str(self.name_en or self.name_nb), self.identifier)
+
def __repr__(self):
return "{}(id={!r}, identifier={!r}, name_en={!r}, valid_from={!r}, user_allowed_to_change={!r})".format(
self.__class__.__name__,
@@ -307,6 +313,9 @@ class OrganizationalUnit(BaseModel):
self.__class__.__name__, self.pk, self.orgreg_id, self.name_en, self.parent
)
+ def __str__(self):
+ return "{} ({})".format(str(self.name_en or self.name_nb), self.orgreg_id)
+
class Meta:
constraints = [
models.UniqueConstraint(name="unique_orgreg_id", fields=["orgreg_id"])
@@ -328,6 +337,9 @@ class Sponsor(BaseModel):
related_name="sponsor_unit",
)
+ def __str__(self):
+ return "{} ({} {})".format(self.feide_id, self.first_name, self.last_name)
+
def __repr__(self):
return "{}(id={!r}, feide_id={!r}, first_name={!r}, last_name={!r})".format(
self.__class__.__name__,
--
GitLab