Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add page sizes up to 1000 #904

Merged
merged 3 commits into from
Oct 28, 2020
Merged

Add page sizes up to 1000 #904

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
e7dac70
Add page sizes up to 1000
WithoutPants Oct 26, 2020
3515b19
Add changelog entry
WithoutPants Oct 27, 2020
87325eb
Update filename parser page sizes
WithoutPants Oct 27, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 3 additions & 2 deletions pkg/models/querybuilder_sql.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -117,8 +117,9 @@ func getPagination(findFilter *FindFilterType) string {
} else {
perPage = *findFilter.PerPage
}
if perPage > 120 {
perPage = 120

if perPage > 1000 {
perPage = 1000
} else if perPage < 1 {
perPage = 1
}
Expand Down
1 change: 1 addition & 0 deletions ui/v2.5/src/components/Changelog/versions/v040.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@
* Add selective scene export.

### 🎨 Improvements
* Increase page size limit to 1000 and add new page size options.
* Add support for query URL parameter regex replacement when scraping by query URL.
* Include empty fields in isMissing filter
* Show static image on scene wall if preview video is missing.
Expand Down
2 changes: 1 addition & 1 deletion ui/v2.5/src/components/List/ListFilter.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ interface IListFilterProps {
itemsSelected?: boolean;
}

const PAGE_SIZE_OPTIONS = ["20", "40", "60", "120"];
const PAGE_SIZE_OPTIONS = ["20", "40", "60", "120", "250", "500", "1000"];
const minZoom = 0;
const maxZoom = 3;

Expand Down
2 changes: 1 addition & 1 deletion ui/v2.5/src/components/SceneFilenameParser/ParserInput.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -121,7 +121,7 @@ export const ParserInput: React.FC<IParserInputProps> = (
setPattern(pattern + field.getFieldPattern());
}

const PAGE_SIZE_OPTIONS = ["20", "40", "60", "120"];
const PAGE_SIZE_OPTIONS = ["20", "40", "60", "120", "250", "500", "1000"];

return (
<Form.Group>
Expand Down