diff options
| author | Christopher Allan Webber <cwebber@dustycloud.org> | 2013-04-26 11:12:46 -0500 |
|---|---|---|
| committer | Christopher Allan Webber <cwebber@dustycloud.org> | 2013-04-26 11:12:46 -0500 |
| commit | d6251b29ecc76980010fd4048307ea8159b20cec (patch) | |
| tree | 778a0679afd9435481d0d7eb7fbadb7a350b75a2 /mediagoblin/db/models.py | |
| parent | 226f1771e28dde408d08349a4ad990ff8579d0d8 (diff) | |
| parent | 34d8bc9820a945ae6af07764d0ea3b058829fef1 (diff) | |
| download | mediagoblin-d6251b29ecc76980010fd4048307ea8159b20cec.tar.lz mediagoblin-d6251b29ecc76980010fd4048307ea8159b20cec.tar.xz mediagoblin-d6251b29ecc76980010fd4048307ea8159b20cec.zip | |
Merge remote-tracking branch 'refs/remotes/rodney757/issue643' into mergetest
Diffstat (limited to 'mediagoblin/db/models.py')
| -rw-r--r-- | mediagoblin/db/models.py | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/mediagoblin/db/models.py b/mediagoblin/db/models.py index fcfd0f61..2412706e 100644 --- a/mediagoblin/db/models.py +++ b/mediagoblin/db/models.py @@ -410,7 +410,7 @@ class Collection(Base, CollectionMixin): title = Column(Unicode, nullable=False) slug = Column(Unicode) created = Column(DateTime, nullable=False, default=datetime.datetime.now, - index=True) + index=True) description = Column(UnicodeText) creator = Column(Integer, ForeignKey(User.id), nullable=False) # TODO: No of items in Collection. Badly named, can we migrate to num_items? @@ -421,6 +421,10 @@ class Collection(Base, CollectionMixin): backref=backref("collections", cascade="all, delete-orphan")) + __table_args__ = ( + UniqueConstraint('creator', 'slug'), + {}) + def get_collection_items(self, ascending=False): #TODO, is this still needed with self.collection_items being available? order_col = CollectionItem.position |