@@ -130,10 +130,6 @@ export default {
text: this.$strings.LabelFileModified,
value: 'mtimeMs'
},
- {
- text: this.$strings.LabelLibrarySortByProgress,
- value: 'progress'
- },
{
text: this.$strings.LabelRandomly,
value: 'random'
@@ -195,9 +191,3 @@ export default {
}
}
-
-
\ No newline at end of file
diff --git a/client/store/user.js b/client/store/user.js
index 158ec8f4..a67eae34 100644
--- a/client/store/user.js
+++ b/client/store/user.js
@@ -92,7 +92,7 @@ export const actions = {
if (state.settings.orderBy == 'media.duration') {
settingsUpdate.orderBy = 'media.numTracks'
}
- if (state.settings.orderBy == 'media.metadata.publishedYear' || state.settings.orderBy == 'progress') {
+ if (state.settings.orderBy == 'media.metadata.publishedYear') {
settingsUpdate.orderBy = 'media.metadata.title'
}
const invalidFilters = ['series', 'authors', 'narrators', 'publishers', 'publishedDecades', 'languages', 'progress', 'issues', 'ebooks', 'abridged']
diff --git a/client/strings/en-us.json b/client/strings/en-us.json
index 6dba7adb..84cddb66 100644
--- a/client/strings/en-us.json
+++ b/client/strings/en-us.json
@@ -418,7 +418,6 @@
"LabelLanguages": "Languages",
"LabelLastBookAdded": "Last Book Added",
"LabelLastBookUpdated": "Last Book Updated",
- "LabelLastProgressDate": "Last progress: {0}",
"LabelLastSeen": "Last Seen",
"LabelLastTime": "Last Time",
"LabelLastUpdate": "Last Update",
@@ -431,7 +430,6 @@
"LabelLibraryFilterSublistEmpty": "No {0}",
"LabelLibraryItem": "Library Item",
"LabelLibraryName": "Library Name",
- "LabelLibrarySortByProgress": "Progress Updated",
"LabelLimit": "Limit",
"LabelLineSpacing": "Line spacing",
"LabelListenAgain": "Listen Again",
diff --git a/server/utils/queries/libraryItemsBookFilters.js b/server/utils/queries/libraryItemsBookFilters.js
index 85d7f387..ded712cf 100644
--- a/server/utils/queries/libraryItemsBookFilters.js
+++ b/server/utils/queries/libraryItemsBookFilters.js
@@ -399,6 +399,9 @@ module.exports = {
if (filterGroup !== 'series' && sortBy === 'sequence') {
sortBy = 'media.metadata.title'
}
+ if (filterGroup !== 'progress' && sortBy === 'progress') {
+ sortBy = 'media.metadata.title'
+ }
const includeRSSFeed = include.includes('rssfeed')
const includeMediaItemShare = !!user?.isAdminOrUp && include.includes('share')
@@ -529,18 +532,6 @@ module.exports = {
}
}
- // When sorting by progress but not filtering by progress, include media progresses
- if (filterGroup !== 'progress' && sortBy === 'progress') {
- bookIncludes.push({
- model: Database.mediaProgressModel,
- attributes: ['id', 'isFinished', 'currentTime', 'ebookProgress', 'updatedAt'],
- where: {
- userId: user.id
- },
- required: false
- })
- }
-
let { mediaWhere, replacements } = this.getMediaGroupQuery(filterGroup, filterValue)
let bookWhere = Array.isArray(mediaWhere) ? mediaWhere : [mediaWhere]