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

Pass location.search parameter through history search. #2573

Merged
merged 2 commits into from
Oct 19, 2023
Merged

Pass location.search parameter through history search. #2573

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
8987217
Pass location.search parameter through history search.
Terala-Priyanka Oct 18, 2023
a64a945
UIU-2971 - merge master
Terala-Priyanka Oct 19, 2023
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
1 change: 1 addition & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
## [10.1.0] IN PROGRESS

* Don't display affiliations of users with types `patron` or `dcb`. Refs UIU-2967.
* Pass location.search parameter through history search. Refs UIU-2971.

## [10.0.0](https://github.com/folio-org/ui-users/tree/v10.0.0) (2023-10-13)
[Full Changelog](https://github.com/folio-org/ui-users/compare/v9.0.3...v10.0.0)
Expand Down
3 changes: 2 additions & 1 deletion src/views/UserEdit/UserEdit.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -401,8 +401,9 @@ class UserEdit extends React.Component {
onSubmit={onSubmit}
onCancel={() => {
history.push({
pathname: params.id ? `/users/preview/${params.id}${location.search}` : '/users',
pathname: params.id ? `/users/preview/${params.id}` : '/users',
state: location.state,
search: location.search,
});
}}
uniquenessValidator={this.props.mutator.uniquenessValidator}
Expand Down