From 75477937927826c23ce6c9615041dc47abc6b4d6 Mon Sep 17 00:00:00 2001
From: John Mitchell <jmitchel@Johns-MacBook-Pro-46.local>
Date: Wed, 5 Feb 2020 15:51:55 -0500
Subject: [PATCH] add organization to template views in old and new ui

---
 .../client/features/templates/templates.strings.js |  1 +
 .../features/templates/templatesList.view.html     |  5 +++++
 awx/ui/client/src/projects/projects.form.js        |  1 +
 .../JobTemplateDetail/JobTemplateDetail.jsx        | 14 ++++++++++++++
 4 files changed, 21 insertions(+)

diff --git a/awx/ui/client/features/templates/templates.strings.js b/awx/ui/client/features/templates/templates.strings.js
index 68c97c57f7..80dc845a4f 100644
--- a/awx/ui/client/features/templates/templates.strings.js
+++ b/awx/ui/client/features/templates/templates.strings.js
@@ -13,6 +13,7 @@ function TemplatesStrings (BaseString) {
         ADD_DD_JT_LABEL: t.s('Job Template'),
         ADD_DD_WF_LABEL: t.s('Workflow Template'),
         OPEN_WORKFLOW_VISUALIZER: t.s('Click here to open the workflow visualizer'),
+        ROW_ITEM_LABEL_ORGANIZATION: t.s('Organization'),
         ROW_ITEM_LABEL_DESCRIPTION: t.s('Description'),
         ROW_ITEM_LABEL_ACTIVITY: t.s('Activity'),
         ROW_ITEM_LABEL_INVENTORY: t.s('Inventory'),
diff --git a/awx/ui/client/features/templates/templatesList.view.html b/awx/ui/client/features/templates/templatesList.view.html
index 8ed34895a7..a50b040316 100644
--- a/awx/ui/client/features/templates/templatesList.view.html
+++ b/awx/ui/client/features/templates/templatesList.view.html
@@ -91,6 +91,11 @@
                         label-value="{{:: vm.strings.get('list.ROW_ITEM_LABEL_DESCRIPTION') }}"
                         value="{{ template.description | sanitize }}">
                     </at-row-item>
+                    <at-row-item
+                        label-value="{{:: vm.strings.get('list.ROW_ITEM_LABEL_ORGANIZATION') }}"
+                        value="{{ template.summary_fields.organization.name }}"
+                        value-link="/#/organizations/{{ template.summary_fields.organization.id }}">
+                    </at-row-item>
                     <at-row-item
                         label-value="{{:: vm.strings.get('list.ROW_ITEM_LABEL_INVENTORY') }}"
                         value="{{ template.summary_fields.inventory.name }}"
diff --git a/awx/ui/client/src/projects/projects.form.js b/awx/ui/client/src/projects/projects.form.js
index 3ba529749e..7644dd6a69 100644
--- a/awx/ui/client/src/projects/projects.form.js
+++ b/awx/ui/client/src/projects/projects.form.js
@@ -47,6 +47,7 @@ export default ['i18n', 'NotificationsList', 'TemplateList',
                 sourceField: 'name',
                 dataTitle: i18n._('Organization'),
                 required: true,
+                awPopOver: '<p>' + i18n._('When this project is used by a Job Template, Organization cannot be changed.') + '</p>',
                 dataContainer: 'body',
                 dataPlacement: 'right',
                 ngDisabled: '!(project_obj.summary_fields.user_capabilities.edit || canAdd) || !canEditOrg',
diff --git a/awx/ui_next/src/screens/Template/JobTemplateDetail/JobTemplateDetail.jsx b/awx/ui_next/src/screens/Template/JobTemplateDetail/JobTemplateDetail.jsx
index 0b8a118f4a..d5a14bce6f 100644
--- a/awx/ui_next/src/screens/Template/JobTemplateDetail/JobTemplateDetail.jsx
+++ b/awx/ui_next/src/screens/Template/JobTemplateDetail/JobTemplateDetail.jsx
@@ -168,6 +168,20 @@ function JobTemplateDetail({ i18n, template }) {
         <Detail label={i18n._(t`Name`)} value={name} dataCy="jt-detail-name" />
         <Detail label={i18n._(t`Description`)} value={description} />
         <Detail label={i18n._(t`Job Type`)} value={job_type} />
+        {summary_fields.organization ? (
+          <Detail
+            label={i18n._(t`Organization`)}
+            value={
+              <Link
+                to={`/organizations/${summary_fields.organization.id}/details`}
+              >
+                {summary_fields.organization.name}
+              </Link>
+            }
+          />
+        ) : (
+          renderMissingDataDetail(i18n._(t`Project`))
+        )}
         {summary_fields.inventory ? (
           <Detail
             label={i18n._(t`Inventory`)}