From ce47f00e1ec46b801b231adee116eee63bb87c0d Mon Sep 17 00:00:00 2001 From: Tomas Cejka <cejkat@cesnet.cz> Date: Wed, 2 Oct 2019 11:24:10 +0000 Subject: [PATCH] String representation of Django model objects --- flowspec/models.py | 15 +++++++++++++++ peers/models.py | 6 ++++++ 2 files changed, 21 insertions(+) diff --git a/flowspec/models.py b/flowspec/models.py index 8949658c..a5607d93 100644 --- a/flowspec/models.py +++ b/flowspec/models.py @@ -97,6 +97,8 @@ class MatchPort(models.Model): port = models.CharField(max_length=24, unique=True) def __unicode__(self): return self.port + def __str__(self): + return self.__unicode__() class Meta: db_table = u'match_port' @@ -104,6 +106,8 @@ class MatchDscp(models.Model): dscp = models.CharField(max_length=24) def __unicode__(self): return self.dscp + def __str__(self): + return self.__unicode__() class Meta: db_table = u'match_dscp' @@ -111,6 +115,8 @@ class MatchProtocol(models.Model): protocol = models.CharField(max_length=24, unique=True) def __unicode__(self): return self.protocol + def __str__(self): + return self.__unicode__() class Meta: db_table = u'match_protocol' @@ -120,6 +126,9 @@ class FragmentType(models.Model): def __unicode__(self): return "%s" %(self.fragmenttype) + def __str__(self): + return self.__unicode__() + class ThenAction(models.Model): action = models.CharField(max_length=60, choices=THEN_CHOICES, verbose_name="Action") @@ -129,6 +138,9 @@ class ThenAction(models.Model): ret = "%s:%s" %(self.action, self.action_value) return ret.rstrip(":") + def __str__(self): + return self.__unicode__() + class Meta: db_table = u'then_action' ordering = ['action', 'action_value'] @@ -187,6 +199,9 @@ class Route(models.Model): def __unicode__(self): return self.name + def __str__(self): + return self.__unicode__() + class Meta: db_table = u'route' verbose_name = "Rule" diff --git a/peers/models.py b/peers/models.py index 256404b0..4eb7018d 100644 --- a/peers/models.py +++ b/peers/models.py @@ -28,6 +28,8 @@ class PeerRange(models.Model): def __unicode__(self): return self.network + def __str__(self): + return self.__unicode__() class Meta: db_table = u'peer_range' @@ -40,6 +42,8 @@ class TechcEmail(models.Model): def __unicode__(self): return self.email + def __str__(self): + return self.__unicode__() class Meta: db_table = "techc_email" @@ -58,6 +62,8 @@ class Peer(models.Model): def __unicode__(self): return self.peer_name + def __str__(self): + return self.__unicode__() class Meta: db_table = u'peer' -- GitLab