From 8a0578040eccb63201083efaa83b49d2567e6be0 Mon Sep 17 00:00:00 2001 From: Robert Sparks Date: Thu, 21 May 2020 20:59:44 +0000 Subject: [PATCH] Added better self-descriptive __str__ functions to PersonExtResource, GroupExtResource, and DocExtResource - Legacy-Id: 17871 --- ietf/doc/models.py | 3 +++ ietf/group/models.py | 5 ++++- ietf/person/models.py | 3 +++ 3 files changed, 10 insertions(+), 1 deletion(-) diff --git a/ietf/doc/models.py b/ietf/doc/models.py index b32eb70db..c6eb22484 100644 --- a/ietf/doc/models.py +++ b/ietf/doc/models.py @@ -867,6 +867,9 @@ class DocExtResource(models.Model): name = models.ForeignKey(ExtResourceName, on_delete=models.CASCADE) display_name = models.CharField(max_length=255, default='', blank=True) value = models.CharField(max_length=2083) # 2083 is the maximum legal URL length + def __str__(self): + priority = self.display_name or self.name.name + return u"%s (%s) %s" % (priority, self.name.slug, self.value) class RelatedDocHistory(models.Model): source = ForeignKey('DocHistory') diff --git a/ietf/group/models.py b/ietf/group/models.py index 6c1a107e2..1eb02d2db 100644 --- a/ietf/group/models.py +++ b/ietf/group/models.py @@ -262,7 +262,10 @@ class GroupExtResource(models.Model): name = models.ForeignKey(ExtResourceName, on_delete=models.CASCADE) display_name = models.CharField(max_length=255, default='', blank=True) value = models.CharField(max_length=2083) # 2083 is the maximum legal URL length - + def __str__(self): + priority = self.display_name or self.name.name + return u"%s (%s) %s" % (priority, self.name.slug, self.value) + class GroupMilestoneInfo(models.Model): group = ForeignKey(Group) # a group has two sets of milestones, current milestones diff --git a/ietf/person/models.py b/ietf/person/models.py index cdc4d9671..9092870ab 100644 --- a/ietf/person/models.py +++ b/ietf/person/models.py @@ -246,6 +246,9 @@ class PersonExtResource(models.Model): name = models.ForeignKey(ExtResourceName, on_delete=models.CASCADE) display_name = models.CharField(max_length=255, default='', blank=True) value = models.CharField(max_length=2083) # 2083 is the maximum legal URL length + def __str__(self): + priority = self.display_name or self.name.name + return u"%s (%s) %s" % (priority, self.name.slug, self.value) class Alias(models.Model): """This is used for alternative forms of a name. This is the