External-Mirrors/awx
2
0
Fork 0
mirror of https://github.com/ansible/awx.git synced 2026-03-18 17:37:30 -02:30
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #10202 from tiagodread/3420-fix

Browse Source 
Use non-root path links

Resolves ansible/tower#3420
Use non-root path for links

Reviewed-by: Jake McDermott <yo@jakemcdermott.me>
This commit is contained in:
softwarefactory-project-zuul[bot]
2021-05-14 13:44:45 +00:00
committed by GitHub
parent b1cd7eb997 0f8533f123
commit f1767d05b0
3 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
awx/ui_next/src/components/AppContainer/PageHeaderToolbar.jsx
View File

@@ -151,8 +151,8 @@ function PageHeaderToolbar({
aria-label={t`User details`} aria-label={t`User details`}
href={ href={
loggedInUser loggedInUser
? `/#/users/${loggedInUser.id}/details` ? `#/users/${loggedInUser.id}/details`
: '/#/home' : '#/home'
} }
> >
{t`User Details`} {t`User Details`}

2
awx/ui_next/src/components/AppContainer/PageHeaderToolbar.test.jsx
View File

@@ -60,7 +60,7 @@ describe('PageHeaderToolbar', () => {
wrapper.update(); wrapper.update();
expect( expect(
wrapper.find('DropdownItem[aria-label="User details"]').prop('href') wrapper.find('DropdownItem[aria-label="User details"]').prop('href')
).toBe('/#/users/1/details'); ).toBe('#/users/1/details');
expect(wrapper.find('DropdownItem')).toHaveLength(2); expect(wrapper.find('DropdownItem')).toHaveLength(2);
const logout = wrapper.find('DropdownItem li button'); const logout = wrapper.find('DropdownItem li button');

2
awx/ui_next/src/components/ContentError/ContentError.jsx
View File

@@ -15,7 +15,7 @@ import ErrorDetail from '../ErrorDetail';
async function logout() { async function logout() {
await RootAPI.logout(); await RootAPI.logout();
window.location.replace('/#/login'); window.location.replace('#/login');
} }
function ContentError({ error, children, isNotFound }) { function ContentError({ error, children, isNotFound }) {