r6889 - in bigboard/trunk/bigboard/stocks: apps google_calendar

[commits mugshot org]

Author: hp
Date: 2007-11-09 15:25:03 -0600 (Fri, 09 Nov 2007)
New Revision: 6889

Modified:
   bigboard/trunk/bigboard/stocks/apps/AppsStock.py
   bigboard/trunk/bigboard/stocks/apps/apps.py
   bigboard/trunk/bigboard/stocks/apps/apps_widgets.py
   bigboard/trunk/bigboard/stocks/google_calendar/CalendarStock.py
Log:
fix a couple of exceptions that broke the app browser and the calendar notifications

Modified: bigboard/trunk/bigboard/stocks/apps/AppsStock.py
===================================================================
--- bigboard/trunk/bigboard/stocks/apps/AppsStock.py	2007-11-09 20:52:09 UTC (rev 6888)
+++ bigboard/trunk/bigboard/stocks/apps/AppsStock.py	2007-11-09 21:25:03 UTC (rev 6889)
@@ -200,9 +200,7 @@
             if i >= static_size:
                 break
 
-            # don't display apps that are not installed if the user is not logged in;
-            # because the user should be able to see the same list regardless of whether
-            # they are connected, we don't check self.__model.connected here
+            # don't display apps that are not installed if the user is not logged in
             if not self.__model.self_resource and not app.is_installed():
                 continue
 
@@ -224,7 +222,7 @@
 
         #_logger.debug("usage: %s", usage)
 
-        if usage is False and self.__model.connected:
+        if usage is False and self.__model.ready and self.__model.global_resource.online:
             self.__set_message("Enable application tracking", 
                                globals.get_baseurl() + "/account")        
 

Modified: bigboard/trunk/bigboard/stocks/apps/apps.py
===================================================================
--- bigboard/trunk/bigboard/stocks/apps/apps.py	2007-11-09 20:52:09 UTC (rev 6888)
+++ bigboard/trunk/bigboard/stocks/apps/apps.py	2007-11-09 21:25:03 UTC (rev 6889)
@@ -582,7 +582,10 @@
     def search(self, category, search_terms, results_handler):
         _logger.debug("search for category %s search_terms %s" % (category, search_terms))
 
-        if not self.__model.connected:
+        ## this is not really right - there's more work to disable the search box if not .global_resource.online, 
+        ## etc.
+        if not self.__model.ready:
+            _logger.debug("search not working since not ready, FIXME")
             return
  
         ## we want to avoid doing the same search twice in parallel, so if we already have

Modified: bigboard/trunk/bigboard/stocks/apps/apps_widgets.py
===================================================================
--- bigboard/trunk/bigboard/stocks/apps/apps_widgets.py	2007-11-09 20:52:09 UTC (rev 6888)
+++ bigboard/trunk/bigboard/stocks/apps/apps_widgets.py	2007-11-09 21:25:03 UTC (rev 6889)
@@ -80,7 +80,7 @@
         if self.__app.is_installed() or self.__app_location == AppLocation.DESCRIPTION_HEADER:
             self.__subtitle.set_property("text", self.__app.get_generic_name() or self.__app.get_tooltip() or self.__app.get_comment())
         ## for now, install won't work if not connected
-        elif self.__app_location == AppLocation.STOCK and globals.get_data_model().connected:
+        elif self.__app_location == AppLocation.STOCK and globals.get_data_model().ready and globals.get_data_model().global_resource.online:
             self.__subtitle.set_property('text', "(Click to Install)")
         else:
             self.__subtitle.set_property('text', "(Not Installed)")

Modified: bigboard/trunk/bigboard/stocks/google_calendar/CalendarStock.py
===================================================================
--- bigboard/trunk/bigboard/stocks/google_calendar/CalendarStock.py	2007-11-09 20:52:09 UTC (rev 6888)
+++ bigboard/trunk/bigboard/stocks/google_calendar/CalendarStock.py	2007-11-09 21:25:03 UTC (rev 6889)
@@ -704,7 +704,7 @@
                         reminder_seconds = int(reminder.minutes) * 60  
                         # _logger.debug('delta days %s delta seconds %s reminder seconds %s %s\n '% (delta.days, delta_seconds, reminder_seconds, reminder.extension_attributes['method']))
                         # schedule notifications for alerts that need to happen before the next time we poll events
-                        if reminder.extension_attributes['method'] == 'alert' and (delta_seconds - google_stock.polling_periodicity_seconds) < reminder_seconds and not self.__event_alerts.has_key(event.get_link() + reminder.minutes):   
+                        if reminder.extension_attributes['method'] == 'alert' and (delta_seconds - _events_polling_periodicity_seconds) < reminder_seconds and not self.__event_alerts.has_key(event.get_link() + reminder.minutes):   
                            
                            self.__event_alerts[event.get_link() + reminder.minutes] = event
                            if delta_seconds > reminder_seconds: