Taken in. Alex
On Wed, Mar 26, 2014 at 10:46 AM, Barros Pena, Belen < [email protected]> wrote: > > On 25/03/2014 20:48, "Lerner, Dave" <[email protected]> wrote: > > >Branch: lerner/bz6036-empty-folders-clickable > > This works for me. Thanks! > > Belén > > >(Based-on-branch: lerner/bz5966-size-minus-1) > > > >TESTS > >----- > >Build setup: (must build into same database) > > bitbake core-image-minimal core-image-sato > >In toaster: > >Select core-image-minimal > >Select directory structure > >Note that /boot is not expandable > >Select core-image-sato > >Select directory structure > >Note that /boot is expandable with contents > > > >COMMIT > >------ > >bitbake: toaster: fix dirinfo empty dir expansion > > > >[YOCTO 6036] > > > >In the page that shows the directory layout for an image, if the > >directory is empty, then the directory folder icon should be black and > >the table row should not be 'expandable' on a mouse click. That > >behavior depends on the directory's child entry count calculated in the > >view function controlling that page. > > > >Two images in the database with the same directory path in the target > >image, but one with path having entries and the other not having > >any entries caused the path without entries to be clickable; the > >query for a directory's count of entries, didn't filter on the image id, > >only on the path. > > > >Signed-off-by: Dave Lerner <[email protected]> > >--- > > bitbake/lib/toaster/toastergui/views.py | 2 +- > > 1 file changed, 1 insertion(+), 1 deletion(-) > > > > > >bitbake/lib/toaster/toastergui/views.py | 2 +- > > 1 file changed, 1 insertion(+), 1 deletion(-) > > > >diff --git a/bitbake/lib/toaster/toastergui/views.py > >b/bitbake/lib/toaster/toastergui/views.py > >index 83516d9..4ea7189 100644 > >--- a/bitbake/lib/toaster/toastergui/views.py > >+++ b/bitbake/lib/toaster/toastergui/views.py > >@@ -578,7 +578,7 @@ def _get_dir_entries(build_id, target_id, start): > > if o.inodetype == Target_File.ITYPE_DIRECTORY: > > entry['isdir'] = 1 > > # is there content in directory > >- entry['childcount'] = > >Target_File.objects.filter(directory__path=o.path).all().count() > >+ entry['childcount'] = > >Target_File.objects.filter(target__exact=target_id, > >directory__path=o.path).all().count() > > else: > > entry['isdir'] = 0 > > -- Alex Damian Yocto Project SSG / OTC
-- _______________________________________________ toaster mailing list [email protected] https://lists.yoctoproject.org/listinfo/toaster
