Mirrors/stash
1
0
Fork 0
mirror of https://github.com/stashapp/stash.git synced 2025-12-18 12:54:38 +03:00
Code Issues Packages Projects Releases Wiki Activity

Saved filter bugs (#1524)

Browse Source 
* Don't use default filter in VIEW persist state
* Reshuffle randomly sorted saved filters
This commit is contained in:
WithoutPants
2021-06-23 11:01:23 +10:00
committed by GitHub
parent 2fdf672015
commit debf21e6b2
2 changed files with 10 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
ui/v2.5/src/components/List/SavedFilterList.tsx
View File

@@ -165,6 +165,8 @@ export const SavedFilterList: React.FC<ISavedFilterListProps> = ({
const newFilter = filter.clone(); const newFilter = filter.clone();
newFilter.currentPage = 1; newFilter.currentPage = 1;
newFilter.configureFromQueryParameters(JSON.parse(f.filter)); newFilter.configureFromQueryParameters(JSON.parse(f.filter));
// #1507 - reset random seed when loaded
newFilter.randomSeed = -1;
onSetFilter(newFilter); onSetFilter(newFilter);
} }

9
ui/v2.5/src/hooks/ListHook.tsx
View File

@@ -627,11 +627,18 @@ const useList = <QueryResult extends IQueryResult, QueryData extends IDataItem>(
// if default query is set and no search params are set, then // if default query is set and no search params are set, then
// load the default query // load the default query
if (!location.search && defaultFilter?.findDefaultFilter) { // #1512 - use default query only if persistState is ALL
if (
options.persistState === PersistanceLevel.ALL &&
!location.search &&
defaultFilter?.findDefaultFilter
) {
newFilter.currentPage = 1; newFilter.currentPage = 1;
newFilter.configureFromQueryParameters( newFilter.configureFromQueryParameters(
JSON.parse(defaultFilter.findDefaultFilter.filter) JSON.parse(defaultFilter.findDefaultFilter.filter)
); );
// #1507 - reset random seed when loaded
newFilter.randomSeed = -1;
update = true; update = true;
} }