diff options
author | Jessica Tallon <jessica@megworld.co.uk> | 2015-05-20 14:45:25 +0200 |
---|---|---|
committer | Jessica Tallon <jessica@megworld.co.uk> | 2015-05-26 16:48:59 +0200 |
commit | d2256d0b3b6fa03cf7b0911496f891fc4d5f56f7 (patch) | |
tree | 2a274805e5eae2b505d6ca9952996aa4d18ad87b /mediagoblin/db | |
parent | 2e4782ef6d0f35b68a3b01c98c1274f8b7fd523e (diff) | |
download | mediagoblin-d2256d0b3b6fa03cf7b0911496f891fc4d5f56f7.tar.lz mediagoblin-d2256d0b3b6fa03cf7b0911496f891fc4d5f56f7.tar.xz mediagoblin-d2256d0b3b6fa03cf7b0911496f891fc4d5f56f7.zip |
Remove deprecated fields and fix activity creation in tools
Diffstat (limited to 'mediagoblin/db')
-rw-r--r-- | mediagoblin/db/models.py | 9 |
1 files changed, 0 insertions, 9 deletions
diff --git a/mediagoblin/db/models.py b/mediagoblin/db/models.py index 30dd80df..d1df1da1 100644 --- a/mediagoblin/db/models.py +++ b/mediagoblin/db/models.py @@ -284,8 +284,6 @@ class User(Base, UserMixin): location = Column(Integer, ForeignKey("core__locations.id")) get_location = relationship("Location", lazy="joined") - activity = Column(Integer, ForeignKey("core__activity_intermediators.id")) - ## TODO # plugin data would be in a separate model @@ -537,8 +535,6 @@ class MediaEntry(Base, MediaEntryMixin): media_metadata = Column(MutationDict.as_mutable(JSONEncoded), default=MutationDict()) - activity = Column(Integer, ForeignKey("core__activity_intermediators.id")) - ## TODO # fail_error @@ -907,9 +903,6 @@ class MediaComment(Base, MediaCommentMixin): lazy="dynamic", cascade="all, delete-orphan")) - - activity = Column(Integer, ForeignKey("core__activity_intermediators.id")) - def serialize(self, request): """ Unserialize to python dictionary for API """ href = request.urlgen( @@ -990,8 +983,6 @@ class Collection(Base, CollectionMixin): backref=backref("collections", cascade="all, delete-orphan")) - activity = Column(Integer, ForeignKey("core__activity_intermediators.id")) - __table_args__ = ( UniqueConstraint('creator', 'slug'), {}) |