From 790942c0f2e92b3aefbe9bf4baeeb9e38f389b34 Mon Sep 17 00:00:00 2001
From: Alex Corey <alex.swansboro@gmail.com>
Date: Tue, 14 Jan 2020 12:01:02 -0500
Subject: [PATCH] Fixes navigation bug in InventoryAdd Adds SCM Branch field on
 JTForm

---
 .../Template/JobTemplateDetail/JobTemplateDetail.jsx       | 7 ++++++-
 .../src/screens/Template/shared/JobTemplateForm.test.jsx   | 1 +
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/awx/ui_next/src/screens/Template/JobTemplateDetail/JobTemplateDetail.jsx b/awx/ui_next/src/screens/Template/JobTemplateDetail/JobTemplateDetail.jsx
index 94955e78f5..44390be54d 100644
--- a/awx/ui_next/src/screens/Template/JobTemplateDetail/JobTemplateDetail.jsx
+++ b/awx/ui_next/src/screens/Template/JobTemplateDetail/JobTemplateDetail.jsx
@@ -196,7 +196,12 @@ class JobTemplateDetail extends Component {
             ) : (
               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`Forks`)} value={forks || '0'} />
             <Detail label={i18n._(t`Limit`)} value={limit} />
diff --git a/awx/ui_next/src/screens/Template/shared/JobTemplateForm.test.jsx b/awx/ui_next/src/screens/Template/shared/JobTemplateForm.test.jsx
index 7deb756399..ba9bf8a102 100644
--- a/awx/ui_next/src/screens/Template/shared/JobTemplateForm.test.jsx
+++ b/awx/ui_next/src/screens/Template/shared/JobTemplateForm.test.jsx
@@ -27,6 +27,7 @@ describe('<JobTemplateForm />', () => {
       project: {
         id: 3,
         name: 'qux',
+        allow_override: true,
       },
       labels: { results: [{ name: 'Sushi', id: 1 }, { name: 'Major', id: 2 }] },
       credentials: [