Merge lp:~mvo/software-center/whatsnew-leak-lp985389 into lp:software-center

[Michael Vogt]

This branch fixes bug #985389 where the filter restriction "installed-only" leaks into subsequent searches.

It also fixes the case where you are in "whats-new" (or any category with a filter restriction) and the searchaid logic suggests you to search "all-categories". This will also reset the non-global filters.

While working on it I removed some deadcode in softwarepane.py that is now part of searchaid.py but never got
cleaned up.

I would appreciate extra critical review/testing of this one as its potentially doing too much. I think we should be fine because global filters (like supported-only) are honored. And the installed-pane has no searchaid logic or categories so there should be no impact here. But I may overlook something of course :)

[Gary Lasker (gary-lasker)]

This looks good! Both test cases work perfectly, and I did a bunch more testing and found no ill effects, so I think this is good for merging. Note that I did find one small typo in the new reset() method of softwarecenter/db/appfilter.py, which I have fixed.

This is a nice improvement, thank you, Michael!

review: Approve

=== modified file 'softwarecenter/db/appfilter.py'
--- softwarecenter/db/appfilter.py	2012-03-16 18:51:40 +0000
+++ softwarecenter/db/appfilter.py	2012-04-25 08:50:27 +0000
@@ -115,3 +115,10 @@
         new_filter.not_installed_only = self.not_installed_only
         new_filter.restricted_list = self.restricted_list
         return new_filter
+ 
+    def reset(self):
+        """ reset the values that are not global """
+        self.avilable_only = False
+        self.installed_only = False
+        self.not_installed_only = False
+        self.restricted_list = False
 
=== modified file 'softwarecenter/ui/gtk3/panes/availablepane.py'
--- softwarecenter/ui/gtk3/panes/availablepane.py	2012-04-19 07:28:14 +0000
+++ softwarecenter/ui/gtk3/panes/availablepane.py	2012-04-25 08:50:27 +0000
@@ -373,6 +373,9 @@
         """
         self.state.category = None
         self.state.subcategory = None
+        # reset the non-global filters see (LP: #985389)
+        if self.state.filter:
+            self.state.filter.reset()
 
     def on_transaction_started(self, backend, pkgname, appname, trans_id,
                                trans_type):
 
=== modified file 'softwarecenter/ui/gtk3/panes/softwarepane.py'
--- softwarecenter/ui/gtk3/panes/softwarepane.py	2012-04-12 12:10:50 +0000
+++ softwarecenter/ui/gtk3/panes/softwarepane.py	2012-04-25 08:50:27 +0000
@@ -123,7 +123,8 @@
         self.search_term = ""
         self.application = None
         self.limit = 0
-        #~ self.filter = None
+        if self.filter:
+            self.filter.reset()
         self.vadjustment = 0.0
 
 
@@ -368,23 +369,6 @@
             self.action_bar.set_label(
                         label, link_result=self._show_nonapp_pkgs)
 
-    def _on_label_app_list_header_activate_link(self, link, uri):
-        #print "actiavte: ", link, uri
-        if uri.startswith("search:"):
-            self.searchentry.set_text(uri[len("search:"):])
-        elif uri.startswith("search-all:"):
-            self.unset_current_category()
-            self.refresh_apps()
-        elif uri.startswith("search-parent:"):
-            self.apps_subcategory = None
-            self.refresh_apps()
-        elif uri.startswith("search-unsupported:"):
-            self.apps_filter.set_supported_only(False)
-            self.refresh_apps()
-        # FIXME: add ability to remove categories restriction here
-        # True stops event propergation
-        return True
-
     def _show_nonapp_pkgs(self):
         self.nonapps_visible = NonAppVisibility.ALWAYS_VISIBLE
         self.refresh_apps()