diff --git a/awx/ui/client/src/inventory-scripts/add/add.controller.js b/awx/ui/client/src/inventory-scripts/add/add.controller.js index e005515215..522dbe1129 100644 --- a/awx/ui/client/src/inventory-scripts/add/add.controller.js +++ b/awx/ui/client/src/inventory-scripts/add/add.controller.js @@ -20,6 +20,8 @@ export default form = inventoryScriptsFormObject, url = GetBasePath('inventory_scripts'); + $scope.canEdit = true; + generator.inject(form, { mode: 'add' , scope:scope, @@ -38,7 +40,6 @@ export default // Save scope.formSave = function () { - generator.clearApiErrors(); Wait('start'); Rest.setUrl(url); diff --git a/awx/ui/client/src/inventory-scripts/edit/edit.controller.js b/awx/ui/client/src/inventory-scripts/edit/edit.controller.js index 7ed84066b8..a9515d60a5 100644 --- a/awx/ui/client/src/inventory-scripts/edit/edit.controller.js +++ b/awx/ui/client/src/inventory-scripts/edit/edit.controller.js @@ -61,6 +61,10 @@ export default data.summary_fields[form.fields[fld].sourceModel][form.fields[fld].sourceField]; } } + $scope.canEdit = data['script'] !== null; + if (!$scope.canEdit) { + $scope.script = "Script contents hidden"; + } Wait('stop'); }) .error(function (data, status) { diff --git a/awx/ui/client/src/inventory-scripts/inventory-scripts.form.js b/awx/ui/client/src/inventory-scripts/inventory-scripts.form.js index b9a2160a8a..67778ce50f 100644 --- a/awx/ui/client/src/inventory-scripts/inventory-scripts.form.js +++ b/awx/ui/client/src/inventory-scripts/inventory-scripts.form.js @@ -52,6 +52,7 @@ export default function() { addRequired: true, editRequired: true, awDropFile: true, + ngDisabled: '!canEdit', rows: 10, awPopOver: "
Drag and drop your custom inventory script file here or create one in the field to import your custom inventory. " +
"
Script must begin with a hashbang sequence: i.e.... #!/usr/bin/env python