Skip to content

Commit 2bec4e0

Browse files
committed
Merge #604: Fix bug: going back in torrent list after filtering with one tag
cc1b5e4 fix: [#600] going back in torrent list after filtering with one tag (Jose Celano) Pull request description: Fix bug: going back in torrent list after filtering with one tag. ACKs for top commit: josecelano: ACK cc1b5e4 Tree-SHA512: d59bd909bdf35d1506f59c67ad44ba30707be9493bf5a0bb17d72225008564bee9134e12724707cbb1bfcf7ef566b9a50547331236054bbec74c4c01e6d7d32f
2 parents fdabd00 + cc1b5e4 commit 2bec4e0

File tree

1 file changed

+7
-7
lines changed

1 file changed

+7
-7
lines changed

pages/torrents.vue

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -112,10 +112,10 @@ const selectedSorting = computed({
112112
113113
watch(() => route.fullPath, () => {
114114
searchQuery.value = route.query.search as string ?? null;
115-
itemsSorting.value = route.query.sorting as string ?? null;
116-
pageSize.value = isNaN(route.query.pageSize) ? parseInt(route.query.pageSize) : defaultPageSize;
117-
currentPage.value = isNaN(route.query.page) ? parseInt(route.query.page) : 1;
118-
layout.value = route.query.layout as string ?? null;
115+
itemsSorting.value = route.query.sorting as string ?? sortingOptions[0].value;
116+
pageSize.value = isNaN(route.query.pageSize) ? defaultPageSize : parseInt(route.query.pageSize);
117+
currentPage.value = isNaN(route.query.page) ? 1 : parseInt(route.query.page);
118+
layout.value = route.query.layout as string ?? "default";
119119
120120
// Ensure categoryFilters is always an array of strings
121121
categoryFilters.value = Array.isArray(route.query.categoryFilters)
@@ -132,7 +132,7 @@ watch([searchQuery, itemsSorting, pageSize, currentPage, layout, categoryFilters
132132
router.push({
133133
query: {
134134
search: searchQuery.value,
135-
sorting: itemsSorting.value,
135+
sorting: itemsSorting.value ? itemsSorting.value : sortingOptions[0].value,
136136
pageSize: pageSize.value,
137137
page: currentPage.value,
138138
layout: layout.value,
@@ -146,10 +146,10 @@ watch([searchQuery, itemsSorting, pageSize, currentPage, layout, categoryFilters
146146
147147
onActivated(() => {
148148
searchQuery.value = route.query.search as string ?? null;
149-
itemsSorting.value = route.query.sorting as string ?? null;
149+
itemsSorting.value = route.query.sorting as string ?? sortingOptions[0].value;
150150
pageSize.value = route.query.pageSize as number ?? defaultPageSize;
151151
currentPage.value = route.query.page as number ?? 1;
152-
layout.value = route.query.layout as string ?? null;
152+
layout.value = route.query.layout as string ?? "default";
153153
categoryFilters.value = route.query.categoryFilters as string[] ?? null;
154154
tagFilters.value = route.query.tagFilters as string[] ?? null;
155155
});

0 commit comments

Comments
 (0)