diff options
author | Aditi <aditi.iitr@gmail.com> | 2013-08-25 09:24:13 +0530 |
---|---|---|
committer | Aditi <aditi.iitr@gmail.com> | 2013-08-25 09:24:13 +0530 |
commit | 7d9dbe32ccf1606d8ffa147bad2ac81e2af66ec6 (patch) | |
tree | 32f715388cb985b0de84c6c502e7ec98d7f0d885 /mediagoblin/db/models.py | |
parent | 70cc6eb8f383dcc97aeac22216a9da0d65a09085 (diff) | |
parent | e8eec575f3a1d893036ce9b3356d2f56fd15016d (diff) | |
download | mediagoblin-7d9dbe32ccf1606d8ffa147bad2ac81e2af66ec6.tar.lz mediagoblin-7d9dbe32ccf1606d8ffa147bad2ac81e2af66ec6.tar.xz mediagoblin-7d9dbe32ccf1606d8ffa147bad2ac81e2af66ec6.zip |
Merge branch 'master' of git://gitorious.org/mediagoblin/mediagoblin
Diffstat (limited to 'mediagoblin/db/models.py')
-rw-r--r-- | mediagoblin/db/models.py | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/mediagoblin/db/models.py b/mediagoblin/db/models.py index f0cbce2a..4341e086 100644 --- a/mediagoblin/db/models.py +++ b/mediagoblin/db/models.py @@ -69,6 +69,7 @@ class User(Base, UserMixin): # Intented to be nullable=False, but migrations would not work for it # set to nullable=True implicitly. wants_comment_notification = Column(Boolean, default=True) + wants_notifications = Column(Boolean, default=True) license_preference = Column(Unicode) is_admin = Column(Boolean, default=False, nullable=False) url = Column(Unicode) @@ -146,7 +147,7 @@ class RequestToken(Base): callback = Column(Unicode, nullable=False, default=u"oob") created = Column(DateTime, nullable=False, default=datetime.datetime.now) updated = Column(DateTime, nullable=False, default=datetime.datetime.now) - + class AccessToken(Base): """ Model for representing the access tokens @@ -159,7 +160,7 @@ class AccessToken(Base): request_token = Column(Unicode, ForeignKey(RequestToken.token)) created = Column(DateTime, nullable=False, default=datetime.datetime.now) updated = Column(DateTime, nullable=False, default=datetime.datetime.now) - + class NonceTimestamp(Base): """ @@ -646,13 +647,13 @@ with_polymorphic( [ProcessingNotification, CommentNotification]) MODELS = [ - User, Client, RequestToken, AccessToken, NonceTimestamp, MediaEntry, Tag, - MediaTag, MediaComment, Collection, CollectionItem, MediaFile, FileKeynames, + User, Client, RequestToken, AccessToken, NonceTimestamp, MediaEntry, Tag, + MediaTag, MediaComment, Collection, CollectionItem, MediaFile, FileKeynames, MediaAttachmentFile, ProcessingMetaData, Notification, CommentNotification, ProcessingNotification, CommentSubscription] """ - Foundations are the default rows that are created immediately after the tables + Foundations are the default rows that are created immediately after the tables are initialized. Each entry to this dictionary should be in the format of: ModelConstructorObject:List of Dictionaries (Each Dictionary represents a row on the Table to be created, containing each |