From c59e929db40ad98e338776d25065dfa6293296c9 Mon Sep 17 00:00:00 2001 From: Dave Lerner Date: Tue, 25 Mar 2014 15:23:53 -0500 Subject: 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 Signed-off-by: Richard Purdie --- bitbake/lib/toaster/toastergui/views.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'bitbake/lib/toaster/toastergui') 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): 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 -- cgit v1.2.3-54-g00ecf