diff options
| author | Jessica Tallon <jessica@megworld.co.uk> | 2014-09-04 19:12:48 +0100 |
|---|---|---|
| committer | Jessica Tallon <jessica@megworld.co.uk> | 2014-10-06 11:48:03 +0100 |
| commit | 6d36f75f845759da50b81f9cdeb9769fe97c2281 (patch) | |
| tree | c7b1d826dae63f8c5f72a82c29c1d9536e3bf816 /mediagoblin/db/models.py | |
| parent | b61519ce53d9839c4277132967b2073ad6299daf (diff) | |
| download | mediagoblin-6d36f75f845759da50b81f9cdeb9769fe97c2281.tar.lz mediagoblin-6d36f75f845759da50b81f9cdeb9769fe97c2281.tar.xz mediagoblin-6d36f75f845759da50b81f9cdeb9769fe97c2281.zip | |
Fix all the unit tests and clean up code
Diffstat (limited to 'mediagoblin/db/models.py')
| -rw-r--r-- | mediagoblin/db/models.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/mediagoblin/db/models.py b/mediagoblin/db/models.py index 65096500..5f78275b 100644 --- a/mediagoblin/db/models.py +++ b/mediagoblin/db/models.py @@ -459,7 +459,7 @@ class MediaEntry(Base, MediaEntryMixin): "self": { "href": request.urlgen( "mediagoblin.federation.object", - object_type=self.objectType, + object_type=self.object_type, id=self.id, qualified=True ), @@ -1127,7 +1127,7 @@ class ActivityIntermediator(Base): return None model = self.TYPES[self.type] - return model.query.filter_by(activity_as_object=self.id).first() + return model.query.filter_by(activity=self.id).first() def save(self, *args, **kwargs): if self.type not in self.TYPES.keys(): |