On 3 September 2015 at 09:13, Smith, Elliot <[email protected]> wrote:
> On 3 September 2015 at 07:15, Reyna, David L (Wind River) < > [email protected]> wrote: > >> It appears that a fix for 8187 in included in "[Toaster] >> [review-request][PATCH 1/3] toaster: hide irrelevant". >> >> - queryset = Build.objects.filter(outcome__lte = Build.IN_PROGRESS) >> + queryset = Build.objects.filter(project_id = pid) >> >> We might as well make my 8187 a duplicate of Elliot's 8236, and be done >> with it. >> > > I think you're right, David. However, the patch you submitted has some > extra stuff in it which mine doesn't. It could be that I've missed > something. I will compare the two today and see if there's anything we need > from your patch which isn't in mine. > > Let me just mention that the patch I'm submitting is an update of a stray > inherited branch I'm trying to clean up. The branch did several things, > some of which weren't attached to bugs and were incidental fixes. It was > accidental that it overlapped with the work you were doing. I'll try to > avoid duplication like this in future. > I have incorporated elements of the patch you submitted into my branch, and marked my branch as contributing to the fix for 8187. You can see the results in: https://git.yoctoproject.org/cgit/cgit.cgi/poky-contrib/log/?h=elliot/toaster/hide_builds-8236 I tried to cherry-pick from your branch, but its distance from master made the merge problematic, so I copied over the relevant chunks manually instead. If you are happy for me to do so, I can take 8187 and mark it as submitted via my branch. Yours, Elliot >> > -----Original Message----- >> > From: Barros Pena, Belen [mailto:[email protected]] >> > Sent: Wednesday, September 02, 2015 9:22 AM >> > To: SMITH, ELLIOT; [email protected] >> > Cc: Reyna, David >> > Subject: Re: [Toaster] [review-request][PATCH 0/3] Hide irrelevant >> builds >> > >> > >> > >> > On 02/09/2015 17:04, "[email protected] on behalf of >> Elliot >> > Smith" <[email protected] on behalf of >> > [email protected]> wrote: >> > >> > >Hide "in progress" builds everywhere, and only show builds for >> > >the currently-open project on the /project/X/builds page. >> > > >> > >Changes since 71b0568fa43285f0946fae93fb43cea5f3bbecec are in >> > >git://git.yoctoproject.org/poky-contrib, >> elliot/toaster/hide_builds-8236 >> > >http://git.yoctoproject.org/cgit.cgi/poky- >> > contrib/log/?h=elliot/toaster/hi >> > >de_builds-8236 >> > >> > The UI seems to be working correctly: >> > >> > * Builds in progress no longer show >> > * Only the builds for the selected project are shown >> > >> > The latter means that this bug also fixes >> > >> > https://bugzilla.yoctoproject.org/show_bug.cgi?id=8187 >> > >> > Which was assigned to David Reyna, who had a patch out for review, I >> > believe. >> > >> > Just bringing it up so you can decide which one should go in. >> > >> > Cheers >> > >> > Belén >> > >> > > >> > >Related bug: https://bugzilla.yoctoproject.org/show_bug.cgi?id=8236 >> > > >> > >Alexandru DAMIAN (1): >> > > toaster: hide irrelevant builds in the project builds view >> > > >> > >Elliot Smith (2): >> > > toaster: Remove cast to date which causes errors during test >> > > toaster: Add tests for /project/X/builds page >> > > >> > > bitbake/lib/toaster/toastergui/tests.py | 91 >> > >++++++++++++++++++++++++++++++++- >> > > bitbake/lib/toaster/toastergui/views.py | 59 +++++++++++++++------ >> > > bitbake/toaster-requirements.txt | 1 + >> > > 3 files changed, 134 insertions(+), 17 deletions(-) >> > > >> > >-- >> > >Elliot Smith >> > >Software Engineer >> > >Intel OTC >> > > >> > >--------------------------------------------------------------------- >> > >Intel Corporation (UK) Limited >> > >Registered No. 1134945 (England) >> > >Registered Office: Pipers Way, Swindon SN3 1RJ >> > >VAT No: 860 2173 47 >> > > >> > >This e-mail and any attachments may contain confidential material for >> > >the sole use of the intended recipient(s). Any review or distribution >> > >by others is strictly prohibited. If you are not the intended >> > >recipient, please contact the sender and delete all copies. >> > > >> > >-- >> > >_______________________________________________ >> > >toaster mailing list >> > >[email protected] >> > >https://lists.yoctoproject.org/listinfo/toaster >> > >> >> > > > -- > Elliot Smith > Software Engineer > Intel Open Source Technology Centre > -- Elliot Smith Software Engineer Intel Open Source Technology Centre
-- _______________________________________________ toaster mailing list [email protected] https://lists.yoctoproject.org/listinfo/toaster
