aboutsummaryrefslogtreecommitdiffstats
path: root/mediagoblin/db/mixin.py
diff options
context:
space:
mode:
authorJessica Tallon <tsyesika@tsyesika.se>2015-06-24 21:45:39 +0200
committerJessica Tallon <tsyesika@tsyesika.se>2015-06-24 21:45:39 +0200
commit380ea91dab370940d29e292029a6da97b6c5db27 (patch)
tree92d45dca2f816e1d61f1ee88e7c79b5208d46700 /mediagoblin/db/mixin.py
parent39da9940581c8fea274c026df889069a60bf2cf5 (diff)
parentddc2db746f3291dbe11393a814eed9a0fd651365 (diff)
downloadmediagoblin-380ea91dab370940d29e292029a6da97b6c5db27.tar.lz
mediagoblin-380ea91dab370940d29e292029a6da97b6c5db27.tar.xz
mediagoblin-380ea91dab370940d29e292029a6da97b6c5db27.zip
Merge branch Generic Foreign Key changes
Diffstat (limited to 'mediagoblin/db/mixin.py')
-rw-r--r--mediagoblin/db/mixin.py9
1 files changed, 4 insertions, 5 deletions
diff --git a/mediagoblin/db/mixin.py b/mediagoblin/db/mixin.py
index 4602c709..88df1f6b 100644
--- a/mediagoblin/db/mixin.py
+++ b/mediagoblin/db/mixin.py
@@ -432,13 +432,12 @@ class ActivityMixin(object):
"audio": _("audio"),
"person": _("a person"),
}
-
- obj = self.get_object
- target = self.get_target
+ obj = self.object_helper.get_object()
+ target = None if self.target_helper is None else self.target_helper.get_object()
actor = self.get_actor
content = verb_to_content.get(self.verb, None)
- if content is None or obj is None:
+ if content is None or self.object is None:
return
# Decide what to fill the object with
@@ -452,7 +451,7 @@ class ActivityMixin(object):
# Do we want to add a target (indirect object) to content?
if target is not None and "targetted" in content:
if hasattr(target, "title") and target.title.strip(" "):
- target_value = target.title
+ target_value = terget.title
elif target.object_type in object_map:
target_value = object_map[target.object_type]
else: