shaba/awx
1
0
Fork 0
mirror of https://github.com/ansible/awx.git synced 2024-10-27 09:25:10 +03:00
Code Releases Activity

Removes changes to serializer that added type to host recent jobs. Addresses Switch styling issues on host list items.

Browse Source
This commit is contained in:
mabashian 2019-11-04 16:38:49 -05:00
parent d5e9716ceb
commit 4e31bdd2d2
2 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
awx/api/serializers.py
View File

@ -1701,7 +1701,6 @@ class HostSerializer(BaseSerializerWithVariables):
'name': j.job.job_template.name if j.job.job_template is not None else "",
'status': j.job.status,
'finished': j.job.finished,
'type': j.job.get_real_instance_class()._meta.verbose_name.replace(' ', '_')
} for j in obj.job_host_summaries.select_related('job__job_template').order_by('-created')[:5]])
return d

11
awx/ui_next/src/screens/Host/HostList/HostListItem.jsx
View File

@ -6,7 +6,7 @@ import {
DataListItem,
DataListItemRow,
DataListItemCells,
Switch,
Switch as PFSwitch,
Tooltip,
} from '@patternfly/react-core';
import { Link } from 'react-router-dom';
@ -20,6 +20,15 @@ import { Sparkline } from '@components/Sparkline';
import VerticalSeparator from '@components/VerticalSeparator';
import { Host } from '@types';
import styled from 'styled-components';
const Switch = styled(PFSwitch)`
display: flex;
flex-wrap: no-wrap;
/* workaround PF bug; used in calculating switch width: */
--pf-c-switch__toggle-icon--Offset: 0.125rem;
`;
class HostListItem extends React.Component {
static propTypes = {
host: Host.isRequired,