IlyaSobolev/DocSpace-client
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

web: my profile: fix onBack navigation in updateUserForm

Browse Source
This commit is contained in:
Vladislav Makhov 2021-06-07 14:28:14 +03:00
parent 0af3acb46b
commit b6fa346fc0
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
products/ASC.People/Client/src/pages/ProfileAction/Section/Body/updateUserForm.js
View File

@ -303,9 +303,9 @@ class UpdateUserForm extends React.Component {
} }
onCancel() { onCancel() {
const { filter, setFilter, history } = this.props; const { filter, setFilter, history, personal } = this.props;
if (document.referrer) { if (document.referrer || personal) {
history.goBack(); history.goBack();
} else { } else {
history.push(combineUrl(AppServerConfig.proxyURL, config.homepage)); history.push(combineUrl(AppServerConfig.proxyURL, config.homepage));
@ -943,6 +943,7 @@ export default withRouter(
getUserPhoto: peopleStore.targetUserStore.getUserPhoto, getUserPhoto: peopleStore.targetUserStore.getUserPhoto,
disableProfileType: peopleStore.targetUserStore.getDisableProfileType, disableProfileType: peopleStore.targetUserStore.getDisableProfileType,
isSelf: peopleStore.targetUserStore.isMe, isSelf: peopleStore.targetUserStore.isMe,
personal: auth.settingsStore.personal,
}))( }))(
observer( observer(
withTranslation(["ProfileAction", "Common", "Translations"])( withTranslation(["ProfileAction", "Common", "Translations"])(