summaryrefslogtreecommitdiffstats
path: root/bitbake/lib/toaster/toastergui
diff options
context:
space:
mode:
authorDave Lerner <dave.lerner@windriver.com>2014-03-25 15:23:53 -0500
committerRichard Purdie <richard.purdie@linuxfoundation.org>2014-03-28 13:44:52 +0000
commitc59e929db40ad98e338776d25065dfa6293296c9 (patch)
tree95b806227c1508c2dffc583cccce15565e17ea58 /bitbake/lib/toaster/toastergui
parentbae133add9b5a23d9c0f29ecdf2fe0db6f7677c2 (diff)
downloadpoky-c59e929db40ad98e338776d25065dfa6293296c9.tar.gz
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. (Bitbake rev: 964d2d6efe9a2cfa7cd8760cda4453c3d69b2e27) Signed-off-by: Dave Lerner <dave.lerner@windriver.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'bitbake/lib/toaster/toastergui')
-rw-r--r--bitbake/lib/toaster/toastergui/views.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/bitbake/lib/toaster/toastergui/views.py b/bitbake/lib/toaster/toastergui/views.py
index d323b37013..4f7170b516 100644
--- a/bitbake/lib/toaster/toastergui/views.py
+++ b/bitbake/lib/toaster/toastergui/views.py
@@ -646,7 +646,7 @@ def _get_dir_entries(build_id, target_id, start):
646 if o.inodetype == Target_File.ITYPE_DIRECTORY: 646 if o.inodetype == Target_File.ITYPE_DIRECTORY:
647 entry['isdir'] = 1 647 entry['isdir'] = 1
648 # is there content in directory 648 # is there content in directory
649 entry['childcount'] = Target_File.objects.filter(directory__path=o.path).all().count() 649 entry['childcount'] = Target_File.objects.filter(target__exact=target_id, directory__path=o.path).all().count()
650 else: 650 else:
651 entry['isdir'] = 0 651 entry['isdir'] = 0
652 652