From a5a9c76444fd6ed28882e549012a01238bd2ff26 Mon Sep 17 00:00:00 2001 From: warner Date: Wed, 26 Sep 2007 04:03:25 +0100 Subject: [PATCH] waterfall.py: fix weird compression when show_events=false is used --- ChangeLog | 4 ++++ buildbot/status/web/waterfall.py | 16 +++++++++++++++- 2 files changed, 19 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index 7c6e3da..01f5bb3 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,9 @@ 2007-09-25 Brian Warner + * buildbot/status/web/waterfall.py (Spacer): make this *not* + inherit from builder.Event, so that show_events=false doesn't hide + spacers, since that would make the waterfall weirdly compressed. + * buildbot/status/web/waterfall.py (HELP): put the View button in its own section, so it doesn't get visually confused with the reload-timer section diff --git a/buildbot/status/web/waterfall.py b/buildbot/status/web/waterfall.py index 58f683c..fa2bdf7 100644 --- a/buildbot/status/web/waterfall.py +++ b/buildbot/status/web/waterfall.py @@ -182,11 +182,20 @@ class EventBox(components.Adapter): components.registerAdapter(EventBox, builder.Event, IBox) -class Spacer(builder.Event): +class Spacer: + implements(interfaces.IStatusEvent) + def __init__(self, start, finish): self.started = start self.finished = finish + def getTimes(self): + return (self.started, self.finished) + def getText(self): + return [] + def getColor(self): + return None + class SpacerBox(components.Adapter): implements(IBox) @@ -661,6 +670,11 @@ class WaterfallStatusResource(HtmlResource): try: while True: e = g.next() + # e might be builder.BuildStepStatus, + # builder.BuildStatus, builder.Event, + # waterfall.Spacer(builder.Event), or changes.Change . + # The showEvents=False flag means we should hide + # builder.Event . if not showEvents and isinstance(e, builder.Event): continue break -- 2.11.4.GIT