Joost/pics
1
0
Fork 0
forked from Public/pics
Code Issues Pull Requests Projects Releases Wiki Activity

Compare commits

base: Joost:improve_thumbs
Branches Tags
Joost:master Joost:elaborate-dev-setup Joost:improve_thumbs Joost:exif-date-time-original Joost:refactor-tables Joost:autosuggest Public:master
Joost:version-1.2 Joost:version-1.1 Joost:version-1.0 Public:version-1.2 Public:version-1.1 Public:version-1.0
...
compare: Joost:7d82a4a9249e5a1d2e6d0b9e7e26fc128ca46be3
Branches Tags
Joost:master Joost:elaborate-dev-setup Joost:improve_thumbs Joost:exif-date-time-original Joost:refactor-tables Joost:autosuggest Public:master
Joost:version-1.2 Joost:version-1.1 Joost:version-1.0 Public:version-1.2 Public:version-1.1 Public:version-1.0

2 Commits
improve_th ... 7d82a4a924

Author SHA1 Message Date
Aaron van Geffen
7d82a4a924 Merge pull request 'Complete date-ordered orderings' (#29) from electricdusk/pics:assets-complete-ordering into master 
Reviewed-on: Public/pics#29
 2022-11-22 21:09:10 +01:00
Amber Sprenkels
b7a37c85f6 Complete date-ordered orderings 
Bug as reported by Yorick: When two Assets have the same capture
date, a bug occurs in the interface where the user gets stuck in
a loop when moving to the next image.

This patch uses the primary key as a fallback when ordering the
images by capture date.  This way, the asset ordering is complete
and it should resolve the bug.
 2022-11-22 12:00:53 +01:00
1 changed files with 8 additions and 12 deletions
Expand all files Collapse all files

20
models/Asset.php
View File

@@ -606,14 +606,12 @@ class Asset
FROM assets_tags AS t
INNER JOIN assets AS a ON a.id_asset = t.id_asset
WHERE t.id_tag = {int:id_tag} AND
a.date_captured <= {datetime:date_captured} AND
a.id_asset != {int:id_asset}
ORDER BY a.date_captured DESC'
(a.date_captured, a.id_asset) < ({datetime:date_captured}, {int:id_asset})
ORDER BY a.date_captured DESC, a.id_asset DESC'
: '
FROM assets AS a
WHERE date_captured >= {datetime:date_captured} AND
a.id_asset != {int:id_asset}
ORDER BY date_captured ASC')
WHERE (a.date_captured, a.id_asset) > ({datetime:date_captured}, {int:id_asset})
ORDER BY date_captured ASC, a.id_asset ASC')
. '
LIMIT 1',
[
@@ -639,14 +637,12 @@ class Asset
FROM assets_tags AS t
INNER JOIN assets AS a ON a.id_asset = t.id_asset
WHERE t.id_tag = {int:id_tag} AND
a.date_captured >= {datetime:date_captured} AND
a.id_asset != {int:id_asset}
ORDER BY a.date_captured ASC'
(a.date_captured, a.id_asset) > ({datetime:date_captured}, {int:id_asset})
ORDER BY a.date_captured ASC, a.id_asset ASC'
: '
FROM assets AS a
WHERE date_captured <= {datetime:date_captured} AND
a.id_asset != {int:id_asset}
ORDER BY date_captured DESC')
WHERE (a.date_captured, a.id_asset) < ({datetime:date_captured}, {int:id_asset})
ORDER BY date_captured DESC, a.id_asset DESC')
. '
LIMIT 1',
[