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

Fixes broken link from User to UserOrg (#11759)

Browse Source
This commit is contained in:
Alex Corey
2022-02-22 16:34:30 -05:00
committed by GitHub
parent eb859b9812
commit fa47e48a15
3 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
awx/ui/src/screens/User/UserOrganizations/UserOrganizationList.js
View File

@@ -20,7 +20,7 @@ const QS_CONFIG = getQSConfig('organizations', {
function UserOrganizationList() { function UserOrganizationList() {
const location = useLocation(); const location = useLocation();
const { id: userId } = useParams(); const { id } = useParams();
const { const {
result: { organizations, count, searchableKeys, relatedSearchableKeys }, result: { organizations, count, searchableKeys, relatedSearchableKeys },
@@ -36,8 +36,8 @@ function UserOrganizationList() {
}, },
actions, actions,
] = await Promise.all([ ] = await Promise.all([
UsersAPI.readOrganizations(userId, params), UsersAPI.readOrganizations(id, params),
UsersAPI.readOrganizationOptions(), UsersAPI.readOrganizationOptions(id),
]); ]);
return { return {
searchableKeys: Object.keys(actions.data.actions?.GET || {}).filter( searchableKeys: Object.keys(actions.data.actions?.GET || {}).filter(
@@ -49,7 +49,7 @@ function UserOrganizationList() {
organizations: results, organizations: results,
count: orgCount, count: orgCount,
}; };
}, [userId, location.search]), }, [id, location.search]),
{ {
organizations: [], organizations: [],
count: 0, count: 0,

2
awx/ui/src/screens/User/UserOrganizations/UserOrganizationList.test.js
View File

@@ -72,6 +72,6 @@ describe('<UserOrganizationlist />', () => {
page_size: 20, page_size: 20,
type: 'organization', type: 'organization',
}); });
expect(UsersAPI.readOrganizationOptions).toBeCalled(); expect(UsersAPI.readOrganizationOptions).toBeCalledWith('1');
}); });
}); });

2
awx/ui/src/screens/User/UserOrganizations/UserOrganizationListItem.js
View File

@@ -12,7 +12,7 @@ export default function UserOrganizationListItem({ organization }) {
> >
<Td id={labelId} dataLabel={t`Name`}> <Td id={labelId} dataLabel={t`Name`}>
<Link to={`/organizations/${organization.id}/details`} id={labelId}> <Link to={`/organizations/${organization.id}/details`} id={labelId}>
{organization.name} <b>{organization.name}</b>
</Link> </Link>
</Td> </Td>
<Td dataLabel={t`Description`}>{organization.description}</Td> <Td dataLabel={t`Description`}>{organization.description}</Td>