Merge branch 'remove-scan-job-templates-inv-edit' of https://github.com/mabashian/ansible-tower into mabashian-remove-scan-job-templates-inv-edit

# Conflicts:
#	awx/ui/client/src/system-tracking/system-tracking.partial.html

awx/ui/client/src/forms/Inventories.js

@@ -78,82 +78,6 @@ export default
             },
 
             related: {
-                scan_job_templates: {
-                    awToolTip: 'Please save before adding a scan job template',
-                    dataPlacement: 'top',
-                    basePath: 'inventories/:id/scan_job_templates',
-                    type: 'collection',
-                    title: 'Scan Job Templates',
-                    iterator: 'scan_job_template',
-                    index: false,
-                    open: false,
-
-                    actions: {
-                        add: {
-                            ngClick: "addScanJob()",
-                            label: 'Add',
-                            awToolTip: 'Add a scan job template',
-                            actionClass: 'btn List-buttonSubmit',
-                            buttonContent: '+ ADD'
-                        }
-                    },
-
-                    fields: {
-                      smart_status: {
-                          label: 'Status',
-                          columnClass: 'List-tableCell',
-                          searchable: false,
-                          nosort: true,
-                          ngInclude: "'/static/partials/scan-job-template-smart-status.html'",
-                          type: 'template'
-                        },
-                        name: {
-                            key: true,
-                            label: 'Name',
-                            linkTo: '/#/inventories/{{inventory_id}}/job_templates/{{scan_job_template.id}}'
-                        },
-                        description: {
-                            label: 'Description'
-                        }
-                    },
-
-                    fieldActions: {
-                        submit: {
-                          label: 'Launch',
-                          ngClick: "launchScanJob()",
-                          awToolTip: 'Launch the scan job template',
-                          'class': 'btn btn-default'
-                        },
-                        schedule: {
-                            label: 'Schedule',
-                            ngClick: 'scheduleScanJob()',
-                            awToolTip: 'Schedule future job template runs',
-                            dataPlacement: 'top',
-                        },
-                        copy: {
-                            label: 'Copy',
-                            ngClick: "copyScanJobTemplate()",
-                            "class": 'btn-danger btn-xs',
-                            awToolTip: 'Copy template',
-                            dataPlacement: 'top',
-                            ngHide: 'job_template.summary_fields.can_copy === false'
-                        },
-                        edit: {
-                            label: 'Edit',
-                            ngClick: "editScanJob()",
-                            icon: 'icon-edit',
-                            awToolTip: 'Edit the scan job template',
-                            'class': 'btn btn-default'
-                        },
-                        "delete": {
-                            label: 'Delete',
-                            ngClick: "deleteScanJob()",
-                            icon: 'icon-trash',
-                            "class": 'btn-danger',
-                            awToolTip: 'Delete the scan job template'
-                        }
-                    }
-                },
                 permissions: {
                     awToolTip: 'Please save before assigning permissions',
                     dataPlacement: 'top',
@@ -201,10 +125,6 @@ export default
 
             relatedSets: function(urls) {
                 return {
-                    scan_job_templates: {
-                        iterator: 'scan_job_template',
-                        url: urls.scan_job_templates
-                    },
                     permissions: {
                         iterator: 'permission',
                         url: urls.access_list

awx/ui/client/src/system-tracking/system-tracking.partial.html

@@ -1,7 +1,7 @@
 <section class="SystemTrackingContainer Panel" ng-if="noModuleData">
     <section class="FactDataError SystemTrackingContainer-main">
         <p class="FactDataError-note--full">
-            To setup or run scan jobs, edit the "<a ui-sref="inventories.edit({ inventory_id: inventory.id })">{{inventory.name}}</a>" inventory and select "Scan Job Templates."
+            To set up scan jobs, create a job template of type 'scan' that targets the "<a ui-sref="inventories.edit({inventory_id: inventory.id})">{{inventory.name}}</a>" inventory.
         </p>
     </section>
 </section>