mirror
/
photoview
mirror of https://github.com/photoview/photoview.git
1
Fork 0
Code

Fix album downloads when running production

This commit is contained in:
viktorstrate 2021-09-26 15:15:31 +02:00
parent 68b6a49638
commit 7799674b74
No known key found for this signature in database
GPG Key ID: 3F855605109C1E8A
2 changed files with 11 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
api/routes/downloads.go
View File

@ -36,8 +36,15 @@ func RegisterDownloadRoutes(db *gorm.DB, router *mux.Router) {
return
}
var mediaWhereQuery string
if db.Dialector.Name() == "postgres" {
mediaWhereQuery = "\"Media\".album_id = ?"
} else {
mediaWhereQuery = "Media.album_id = ?"
}
var mediaURLs []*models.MediaURL
if err := db.Joins("Media").Where("media.album_id = ?", album.ID).Where("media_urls.purpose IN (?)", mediaPurposeList).Find(&mediaURLs).Error; err != nil {
if err := db.Joins("Media").Where(mediaWhereQuery, album.ID).Where("media_urls.purpose IN (?)", mediaPurposeList).Find(&mediaURLs).Error; err != nil {
w.WriteHeader(http.StatusInternalServerError)
w.Write([]byte("internal server error"))
return

4
ui/src/service-worker.ts
View File

@ -22,7 +22,9 @@ clientsClaim()
// Their URLs are injected into the manifest variable below.
// This variable must be present somewhere in your service worker file,
// even if you decide not to use precaching. See https://cra.link/PWA
precacheAndRoute(self.__WB_MANIFEST)
precacheAndRoute(self.__WB_MANIFEST, {
ignoreURLParametersMatching: [/^\/api\/.*/],
})
// Set up App Shell-style routing, so that all navigation requests
// are fulfilled with your index.html shell. Learn more at