diff options
Diffstat (limited to 'mediagoblin/db')
| -rw-r--r-- | mediagoblin/db/mixin.py | 2 | ||||
| -rw-r--r-- | mediagoblin/db/sql/models.py | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/mediagoblin/db/mixin.py b/mediagoblin/db/mixin.py index a5aded02..fe6dc796 100644 --- a/mediagoblin/db/mixin.py +++ b/mediagoblin/db/mixin.py @@ -60,7 +60,7 @@ class MediaEntryMixin(object): if duplicate: if self.id is not None: - self.slug = "%s-%s" % (self.id, self.slug) + self.slug = u"%s-%s" % (self.id, self.slug) else: self.slug = None diff --git a/mediagoblin/db/sql/models.py b/mediagoblin/db/sql/models.py index d17386fc..9815fcf9 100644 --- a/mediagoblin/db/sql/models.py +++ b/mediagoblin/db/sql/models.py @@ -158,7 +158,7 @@ class MediaEntry(Base, MediaEntryMixin): """get the next 'newer' entry by this user""" media = MediaEntry.query.filter( (MediaEntry.uploader == self.uploader) - & (MediaEntry.state == 'processed') + & (MediaEntry.state == u'processed') & (MediaEntry.id > self.id)).order_by(MediaEntry.id).first() if media is not None: @@ -168,7 +168,7 @@ class MediaEntry(Base, MediaEntryMixin): """get the next 'older' entry by this user""" media = MediaEntry.query.filter( (MediaEntry.uploader == self.uploader) - & (MediaEntry.state == 'processed') + & (MediaEntry.state == u'processed') & (MediaEntry.id < self.id)).order_by(desc(MediaEntry.id)).first() if media is not None: |