From e6a57d4c92bd8fb60ebde1d5decd0ba61d7cf464 Mon Sep 17 00:00:00 2001 From: Dana Van Aken Date: Tue, 27 Aug 2019 13:23:18 -0400 Subject: [PATCH] BaseModel __unicode__ method now returns str(pk) if the 'name' attribute does not exist --- server/website/website/models.py | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/server/website/website/models.py b/server/website/website/models.py index c79b28f..a1e9180 100644 --- a/server/website/website/models.py +++ b/server/website/website/models.py @@ -224,7 +224,7 @@ class Session(BaseModel): class SessionKnobManager(models.Manager): @staticmethod def get_knobs_for_session(session): - # Returns a dict of the knob + # Returns a dict of the knob knobs = KnobCatalog.objects.filter(dbms=session.dbms) knob_dicts = list(knobs.values()) for i, _ in enumerate(knob_dicts): @@ -422,12 +422,18 @@ class PipelineRun(models.Model): start_time = models.DateTimeField() end_time = models.DateTimeField(null=True) + def __unicode__(self): + return str(self.pk) + + def __str__(self): + return self.__unicode__() + class Meta: # pylint: disable=old-style-class,no-init ordering = ["-id"] class PipelineData(models.Model): - pipeline_run = models.ForeignKey(PipelineRun) + pipeline_run = models.ForeignKey(PipelineRun, verbose_name='group') task_type = models.IntegerField(choices=PipelineTaskType.choices()) workload = models.ForeignKey(Workload) data = models.TextField()