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

Fix error that caused infinite CPU loop

This commit is contained in:
viktorstrate 2020-12-06 16:54:19 +01:00
parent 4b778fbdde
commit b13873f48d
No known key found for this signature in database
GPG Key ID: 3F855605109C1E8A
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
api/graphql/resolvers/album.go
View File

@ -19,7 +19,7 @@ func (r *queryResolver) MyAlbums(ctx context.Context, filter *models.Filter, onl
query := r.Database.Where("owner_id = ?", user.ID)
if onlyRoot != nil && *onlyRoot == true {
query = query.Where("parent_album = ()", query.Model(&models.Album{})).Select("id").Where("parent_album IS NULL AND owner_id = ?", user.ID)
query = query.Where("parent_album_id = (?)", r.Database.Model(&models.Album{}).Select("id").Where("parent_album_id IS NULL AND owner_id = ?", user.ID))
}
if showEmpty == nil || *showEmpty == false {
@ -118,7 +118,7 @@ func (r *albumResolver) Thumbnail(ctx context.Context, obj *models.Album) (*mode
func (r *albumResolver) SubAlbums(ctx context.Context, parent *models.Album, filter *models.Filter) ([]*models.Album, error) {
var albums []*models.Album
if err := r.Database.Where("parent_album = ?", parent.ID).Find(&albums).Error; err != nil {
if err := r.Database.Where("parent_album_id = ?", parent.ID).Find(&albums).Error; err != nil {
return nil, err
}