External-Mirrors/awx
2
0
Fork 0
mirror of https://github.com/ansible/awx.git synced 2026-01-14 11:20:39 -03:30
Code Issues Packages Projects Releases Wiki Activity

Fix bad merge conflict resolution

Browse Source
This commit is contained in:
mabashian 2021-09-29 13:55:30 -04:00
parent 8e34898b4e
commit e5578a8ef3
1 changed files with 5 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
awx/ui/src/App.js
View File

@ -103,7 +103,11 @@ const ProtectedRoute = ({ children, ...rest }) => {
const location = useLocation();
useEffect(() => {
setAuthRedirectTo(authRedirectTo === '/logout' ? '/' : pathname);
setAuthRedirectTo(
authRedirectTo === '/logout'
? '/'
: `${location.pathname}${location.search}`
);
});
if (isAuthenticated(document.cookie)) {
@ -116,12 +120,6 @@ const ProtectedRoute = ({ children, ...rest }) => {
);
}
setAuthRedirectTo(
authRedirectTo === '/logout'
? '/'
: `${location.pathname}${location.search}`
);
return <Redirect to="/login" />;
};