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

Fixes navigation bug in InventoryAdd Adds SCM Branch field on JTForm

Browse Source
This commit is contained in:
Alex Corey
2020-01-14 12:01:02 -05:00
parent fd1e574fcb
commit 790942c0f2
2 changed files with 7 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
awx/ui_next/src/screens/Template/JobTemplateDetail/JobTemplateDetail.jsx
View File

@@ -196,7 +196,12 @@ class JobTemplateDetail extends Component {
) : ( ) : (
renderMissingDataDetail(i18n._(t`Project`)) renderMissingDataDetail(i18n._(t`Project`))
)} )}
<Detail label={i18n._(t`SCM Branch`)} value={template.scm_branch} /> {template.scm_branch && (
<Detail
label={i18n._(t`SCM Branch`)}
value={template.scm_branch}
/>
)}
<Detail label={i18n._(t`Playbook`)} value={playbook} /> <Detail label={i18n._(t`Playbook`)} value={playbook} />
<Detail label={i18n._(t`Forks`)} value={forks || '0'} /> <Detail label={i18n._(t`Forks`)} value={forks || '0'} />
<Detail label={i18n._(t`Limit`)} value={limit} /> <Detail label={i18n._(t`Limit`)} value={limit} />

1
awx/ui_next/src/screens/Template/shared/JobTemplateForm.test.jsx
View File

@@ -27,6 +27,7 @@ describe('<JobTemplateForm />', () => {
project: { project: {
id: 3, id: 3,
name: 'qux', name: 'qux',
allow_override: true,
}, },
labels: { results: [{ name: 'Sushi', id: 1 }, { name: 'Major', id: 2 }] }, labels: { results: [{ name: 'Sushi', id: 1 }, { name: 'Major', id: 2 }] },
credentials: [ credentials: [