Merge lp:~gary-lasker/software-center/temp-disable-lobby-recommendations-view into lp:software-center

[Gary Lasker]

(resumit with shorter branch name, changelog was not pretty at all! d'oh!)

In preparation for FF release today, this branch temporarily hides the lobby recommendations opt-in and display panel pending depoyment of support for this feature on the production server. Once that has been deployed, we can back out this change (FIXMEs everywhere to document this).

=== modified file 'debian/changelog'
--- debian/changelog	2012-02-15 17:39:18 +0000
+++ debian/changelog	2012-02-15 18:19:17 +0000
@@ -60,12 +60,16 @@
     - implement the recommendations opt-in UI and flow, upload
       of the user profile data after opt-in, and display of
       per-application recommendations in the details view
+  * lp:~gary-lasker/software-center/temp-disable-lobby-recommendations-view:
+    - temporarily hide the lobby recommendations opt-in and display
+      view pending rollout of the corresponding support on the
+      production server
   
   [ Juhana Jauhiainen ]
   * softwarecenter/backend/launchpad.py:
     - replaced EDGE_SERVICE_ROOT with LPNET_SERVICE_ROOT. (LP: #737697)
 
- -- Gary Lasker <[e-mail]>  Wed, 15 Feb 2012 12:37:53 -0500
+ -- Gary Lasker <[e-mail]>  Wed, 15 Feb 2012 13:09:24 -0500
 
 software-center (5.1.8) precise; urgency=low
 
 
=== modified file 'softwarecenter/ui/gtk3/app.py'
--- softwarecenter/ui/gtk3/app.py	2012-02-15 16:55:32 +0000
+++ softwarecenter/ui/gtk3/app.py	2012-02-15 18:19:17 +0000
@@ -454,14 +454,16 @@
 
     def on_available_pane_created(self, widget):
         self.available_pane.searchentry.grab_focus()
-        # connect a signal to monitor the recommendations opt-in state and
-        # persist the recommendations uuid on an opt-in
-        self.available_pane.cat_view.recommended_for_you_panel.connect(
-                        "recommendations-opt-in",
-                        self._on_recommendations_opt_in)
-        self.available_pane.cat_view.recommended_for_you_panel.connect(
-                        "recommendations-opt-out",
-                        self._on_recommendations_opt_out)
+        # FIXME: temporarily remove this with the other lobby recommendations
+        #        pieces and re-enable when the server-side support is in place
+#        # connect a signal to monitor the recommendations opt-in state and
+#        # persist the recommendations uuid on an opt-in
+#        self.available_pane.cat_view.recommended_for_you_panel.connect(
+#                        "recommendations-opt-in",
+#                        self._on_recommendations_opt_in)
+#        self.available_pane.cat_view.recommended_for_you_panel.connect(
+#                        "recommendations-opt-out",
+#                        self._on_recommendations_opt_out)
     
     #~ def on_installed_pane_created(self, widget):
         #~ pass
 
=== modified file 'softwarecenter/ui/gtk3/views/catview_gtk.py'
--- softwarecenter/ui/gtk3/views/catview_gtk.py	2012-02-15 11:02:29 +0000
+++ softwarecenter/ui/gtk3/views/catview_gtk.py	2012-02-15 18:19:17 +0000
@@ -252,7 +252,8 @@
 
         self._append_whats_new()
         self._append_top_rated()
-        self._append_recommended_for_you()
+        # FIXME: Temporarily hide this as server support is not yet in place!!
+#        self._append_recommended_for_you()
         self._append_appcount()
 
         #self._append_video_clips()
@@ -485,7 +486,8 @@
 
         self._update_top_rated_content()
         self._update_whats_new_content()
-        self._update_recommended_for_you_content()
+        # FIXME: Temporarily remove this as server support is not yet in place!!
+#        self._update_recommended_for_you_content()
         self._update_appcount()
         return
 
 
=== modified file 'test/gtk3/test_catview.py'
--- test/gtk3/test_catview.py	2012-02-14 00:39:53 +0000
+++ test/gtk3/test_catview.py	2012-02-15 18:19:17 +0000
@@ -85,8 +85,9 @@
         self.assertFalse(view.whats_new_frame.get_property("visible"))
         self._p()
         win.destroy()
-        
-    def test_subcatview_recommended_for_you_opt_in_display(self):
+       
+    # FIXME: Temporarily disable this as server support is not yet in place!!    
+    def disabled_test_subcatview_recommended_for_you_opt_in_display(self):
         from softwarecenter.ui.gtk3.views.catview_gtk import get_test_window_catview
         # get the widgets we need
         win = get_test_window_catview()
@@ -101,7 +102,8 @@
     # patch out the agent query method to avoid making the actual server call
     @patch('softwarecenter.backend.recagent.RecommenderAgent'
            '.query_submit_profile')
-    def test_subcatview_recommended_for_you_spinner_display(self, mock_query):
+    # FIXME: Temporarily disable this as server support is not yet in place!!
+    def disabled_test_subcatview_recommended_for_you_spinner_display(self, mock_query):
         from softwarecenter.ui.gtk3.views.catview_gtk import get_test_window_catview
         # get the widgets we need
         win = get_test_window_catview()
@@ -120,7 +122,8 @@
     # patch out the agent query method to avoid making the actual server call
     @patch('softwarecenter.backend.recagent.RecommenderAgent'
            '.query_submit_profile')
-    def test_subcatview_recommended_for_you_display_recommendations(self, mock_query):
+    # FIXME: Temporarily disable this as server support is not yet in place!!
+    def disabled_test_subcatview_recommended_for_you_display_recommendations(self, mock_query):
         from softwarecenter.ui.gtk3.views.catview_gtk import get_test_window_catview
         # get the widgets we need
         win = get_test_window_catview()