Merge pull request #2226 from nextcloud/artonge/fix/search_on_files_w…

…ithout_metadata Also sort by getlastmodified when searching for photos
nextcloud · Jan 2, 2024 · dd266f2 · dd266f2
2 parents d84be2a + 0040f87
commit dd266f2
Show file tree

Hide file tree

Showing 11 changed files with 19 additions and 15 deletions.
diff --git a/js/photos-main.js b/js/photos-main.js
diff --git a/js/photos-main.js.map b/js/photos-main.js.map
diff --git a/js/photos-node_modules_vue-material-design-icons_ArrowLeft_vue-src_views_Timeline_vue.js b/js/photos-node_modules_vue-material-design-icons_ArrowLeft_vue-src_views_Timeline_vue.js
diff --git a/js/photos-node_modules_vue-material-design-icons_ArrowLeft_vue-src_views_Timeline_vue.js.map b/js/photos-node_modules_vue-material-design-icons_ArrowLeft_vue-src_views_Timeline_vue.js.map
diff --git a/js/photos-public.js b/js/photos-public.js
diff --git a/js/photos-public.js.map b/js/photos-public.js.map
diff --git a/js/photos-src_components_Collection_CollectionContent_vue-src_components_FilesPicker_vue.js b/js/photos-src_components_Collection_CollectionContent_vue-src_components_FilesPicker_vue.js
diff --git a/...tos-src_components_Collection_CollectionContent_vue-src_components_FilesPicker_vue.js.map b/...tos-src_components_Collection_CollectionContent_vue-src_components_FilesPicker_vue.js.map
diff --git a/js/photos-src_mixins_FetchFilesMixin_js-src_components_Faces_FaceMergeForm_vue.js b/js/photos-src_mixins_FetchFilesMixin_js-src_components_Faces_FaceMergeForm_vue.js
diff --git a/js/photos-src_mixins_FetchFilesMixin_js-src_components_Faces_FaceMergeForm_vue.js.map b/js/photos-src_mixins_FetchFilesMixin_js-src_components_Faces_FaceMergeForm_vue.js.map
diff --git a/src/services/PhotoSearch.js b/src/services/PhotoSearch.js
@@ -132,6 +132,10 @@ export default async function(path = '', options = {}) {
 							<d:prop><nc:metadata-photos-original_date_time/></d:prop>
 							<d:descending/>
 						</d:order>
+						<d:order>
+							<d:prop><d:getlastmodified/></d:prop>
+							<d:descending/>
+						</d:order>
 					</d:orderby>
 					<d:limit>
 						<d:nresults>${options.nbResults}</d:nresults>