Web   ·   Wiki   ·   Activities   ·   Blog   ·   Lists   ·   Chat   ·   Meeting   ·   Bugs   ·   Git   ·   Translate   ·   Archive   ·   People   ·   Donate
summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTomeu Vizoso <tomeu@tomeuvizoso.net>2007-10-16 14:56:02 (GMT)
committer Tomeu Vizoso <tomeu@tomeuvizoso.net>2007-10-16 14:56:02 (GMT)
commit05236c66702b4d674123a50061c553ae9e11d589 (patch)
treee8ae09458ea997fa2b891e3627912e6d0d7ce194
parentaed093dbc28e67ae87f2d482355ce47842c9d625 (diff)
Fix retrieving the activities suitable for resuming a journal entry
-rw-r--r--lib/sugar/datastore/datastore.py5
1 files changed, 3 insertions, 2 deletions
diff --git a/lib/sugar/datastore/datastore.py b/lib/sugar/datastore/datastore.py
index 6f1e146..77ca117 100644
--- a/lib/sugar/datastore/datastore.py
+++ b/lib/sugar/datastore/datastore.py
@@ -123,17 +123,18 @@ class DSObject(object):
if not result:
for parent_mime in mime.get_mime_parents(mime_type):
result.extend(registry.get_activities_for_type(parent_type))
+ return result
def get_activities(self):
activities = []
- bundle_id = self.metadata['activity']
+ bundle_id = self.metadata.get('activity', '')
if bundle_id:
activity_info = activity.get_registry().get_activity(bundle_id)
if activity_info:
activities.append(activity_info)
- mime_type = self.metadata['mime_type']
+ mime_type = self.metadata.get('mime_type', '')
if mime_type:
activities_info = self._get_activities_for_mime(mime_type)
for info in activities_info: