Fix weird ordering of screenshots

This commit is contained in:
rubenwardy 2019-01-08 21:35:46 +00:00
parent 9639cf04f1
commit 0db49efe4a

@ -380,7 +380,7 @@ class Package(db.Model):
lazy="dynamic", order_by=db.desc("package_release_releaseDate")) lazy="dynamic", order_by=db.desc("package_release_releaseDate"))
screenshots = db.relationship("PackageScreenshot", backref="package", screenshots = db.relationship("PackageScreenshot", backref="package",
lazy="dynamic") lazy="dynamic", order_by=db.asc("package_screenshot_id"))
requests = db.relationship("EditRequest", backref="package", requests = db.relationship("EditRequest", backref="package",
lazy="dynamic") lazy="dynamic")
@ -439,11 +439,11 @@ class Package(db.Model):
} }
def getThumbnailURL(self, level=2): def getThumbnailURL(self, level=2):
screenshot = self.screenshots.filter_by(approved=True).first() screenshot = self.screenshots.filter_by(approved=True).order_by(db.asc(PackageScreenshot.id)).first()
return screenshot.getThumbnailURL(level) if screenshot is not None else None return screenshot.getThumbnailURL(level) if screenshot is not None else None
def getMainScreenshotURL(self): def getMainScreenshotURL(self):
screenshot = self.screenshots.filter_by(approved=True).first() screenshot = self.screenshots.filter_by(approved=True).order_by(db.asc(PackageScreenshot.id)).first()
return screenshot.url if screenshot is not None else None return screenshot.url if screenshot is not None else None
def getDetailsURL(self): def getDetailsURL(self):