Merge lp:~evfool/software-center/lp855581 into lp:software-center/5.2

[Robert Roth]

On checking the count of items in subcategories (in category view to hide the empty ones) the supported_only flag has been disregarded, so if the canonical-maintained only was checked, it did count the items in all software, and it had some items, so the subcategory tile has been displayed, but when the user navigated to the subcategory, it was shown as empty, as there were no supported items in the subcategory.
Fixed by ANDing the supported and category query if the flag is checked, to fix LP #855581

[Michael Vogt (mvo)]

Looks good, thanks! A test would be sweel, not sure about the best approach for it yet.

[Michael Vogt (mvo)]

Eh, "would be sweet" of course

[dobey (dobey)]

Robert, are you able to write a test for this as Michael requested?

review: Needs Information

Unmerged revisions

3033. By Robert Roth on 2012-05-22

Do not display empty subcategories (LP: #855581)

=== modified file 'softwarecenter/ui/gtk3/views/catview_gtk.py'
--- softwarecenter/ui/gtk3/views/catview_gtk.py	2012-05-22 14:36:03 +0000
+++ softwarecenter/ui/gtk3/views/catview_gtk.py	2012-05-22 19:55:21 +0000
@@ -613,10 +613,16 @@
         sorted_cats = categories_sorted_by_name(self.categories)
         enquire = xapian.Enquire(self.db.xapiandb)
         app_filter = AppFilter(self.db, self.cache)
+        distro = get_distro()
+        supported_only = get_global_filter().supported_only
         for cat in sorted_cats:
             # add the subcategory if and only if it is non-empty
-            enquire.set_query(cat.query)
-
+            if supported_only:
+                enquire.set_query(xapian.Query(xapian.Query.OP_AND,
+                                    cat.query,
+                                    distro.get_supported_query()))
+            else:
+                enquire.set_query(cat.query)
             if len(enquire.get_mset(0, 1)):
                 tile = CategoryTile(cat.name, cat.iconname)
                 tile.connect('clicked', self.on_category_clicked, cat)