From c2dfedaeefabd189d88f0ced2dbe09352e941668 Mon Sep 17 00:00:00 2001 From: Miquel Torres Date: Sun, 2 Jan 2011 13:27:58 +0100 Subject: [PATCH] Show short commitid string in the timeline tooltip --- speedcenter/codespeed/models.py | 4 ++-- speedcenter/codespeed/views.py | 19 ++++++++++--------- 2 files changed, 12 insertions(+), 11 deletions(-) diff --git a/speedcenter/codespeed/models.py b/speedcenter/codespeed/models.py index 36a55430..c9ce351b 100644 --- a/speedcenter/codespeed/models.py +++ b/speedcenter/codespeed/models.py @@ -28,12 +28,12 @@ class Revision(models.Model): message = models.TextField(blank=True) author = models.CharField(max_length=30, blank=True) - def _short_commitid(self): + def get_short_commitid(self): return self.commitid[:10] def __unicode__(self): return self.date.strftime("%h %d, %H:%M") + " - " + \ - self._short_commitid() + " " + self.tag + self.get_short_commitid() + " " + self.tag class Meta: unique_together = ("commitid", "project") diff --git a/speedcenter/codespeed/views.py b/speedcenter/codespeed/views.py index 2d47724c..4f959de6 100644 --- a/speedcenter/codespeed/views.py +++ b/speedcenter/codespeed/views.py @@ -272,15 +272,16 @@ def gettimelinedata(request): baselineexe = Executable.objects.get(id=exeid) for bench in benchmarks: append = False - timeline = {} - timeline['benchmark'] = bench.name - timeline['benchmark_id'] = bench.id - timeline['benchmark_description'] = bench.description - timeline['units'] = bench.units lessisbetter = bench.lessisbetter and ' (less is better)' or ' (more is better)' - timeline['lessisbetter'] = lessisbetter - timeline['executables'] = {} - timeline['baseline'] = "None" + timeline = { + 'benchmark': bench.name, + 'benchmark_id': bench.id, + 'benchmark_description': bench.description, + 'units': bench.units, + 'lessisbetter': lessisbetter, + 'executables': {}, + 'baseline': "None", + } for executable in executables: resultquery = Result.objects.filter( @@ -296,7 +297,7 @@ def gettimelinedata(request): std_dev = "" if res.std_dev != None: std_dev = res.std_dev results.append( - [str(res.revision.date), res.value, std_dev, res.revision.commitid] + [str(res.revision.date), res.value, std_dev, res.revision.get_short_commitid()] ) timeline['executables'][executable] = results append = True