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.

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

fix(PWA): post login redirection fails due to default_route conflict with other app (backport #2351) #2357

Merged
merged 2 commits into from
Oct 29, 2024

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Oct 29, 2024

When hrms and gameplan are installed on the same site, post login redirection fails because gameplan has an on_login hook return to navigate to /onboarding

image

and hrms tries to route to default route - so it ends up routing to /hrms/onboarding
image


This is an automatic backport of pull request #2351 done by [Mergify](https://mergify.com).

…t with other app (#2351)

(cherry picked from commit 4ba8046)

# Conflicts:
#	hrms/www/hrms.py
Copy link
Contributor Author

mergify bot commented Oct 29, 2024

Cherry-pick of 4ba8046 has failed:

On branch mergify/bp/version-15/pr-2351
Your branch is up to date with 'origin/version-15'.

You are currently cherry-picking commit 4ba8046db.
  (fix conflicts and run "git cherry-pick --continue")
  (use "git cherry-pick --skip" to skip this patch)
  (use "git cherry-pick --abort" to cancel the cherry-pick operation)

Changes to be committed:
	modified:   frontend/src/data/session.js

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   hrms/www/hrms.py

To fix up this pull request, you can check it out locally. See documentation: https://docs.github.com/en/pull-requests/collaborating-with-pull-requests/reviewing-changes-in-pull-requests/checking-out-pull-requests-locally

hrms/www/hrms.py Outdated Show resolved Hide resolved
@ruchamahabal ruchamahabal merged commit 69e62ce into version-15 Oct 29, 2024
7 checks passed
frappe-pr-bot pushed a commit that referenced this pull request Oct 29, 2024
## [15.33.2](v15.33.1...v15.33.2) (2024-10-29)

### Bug Fixes

* **PWA:** post login redirection fails due to `default_route` conflict with other app (backport [#2351](#2351)) ([#2357](#2357)) ([69e62ce](69e62ce))
@frappe-pr-bot
Copy link
Collaborator

🎉 This PR is included in version 15.33.2 🎉

The release is available on GitHub release

Your semantic-release bot 📦🚀

@ruchamahabal ruchamahabal deleted the mergify/bp/version-15/pr-2351 branch October 31, 2024 09:51
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants