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

Remove scan logic from Callback factory and update System Tracking prompts

Browse Source
This commit is contained in:
Marliana Lara 2017-05-15 15:53:40 -04:00
parent 31333bf63b
commit cd46aeb4ec
5 changed files with 3 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
awx/ui/client/src/system-tracking/system-tracking.partial.html
View File

@ -1,7 +1,7 @@
<section class="SystemTrackingContainer Panel" ng-if="noModuleData">
<section class="FactDataError SystemTrackingContainer-main">
<p class="FactDataError-note--full">
To set up scan jobs, create a <a ui-sref="inventoryJobTemplateAdd({inventory_id: inventory.id})">job template</a> of type 'scan' that targets the "<a ui-sref="inventories.edit({inventory_id: inventory.id})">{{inventory.name}}</a>" inventory.
To set up scan jobs, create a <a ui-sref="inventoryJobTemplateAdd({inventory_id: inventory.id})">job template</a> that targets the "<a ui-sref="inventories.edit({inventory_id: inventory.id})">{{inventory.name}}</a>" inventory and check "Store Ansible Facts."
</p>
</section>
</section>
@ -57,7 +57,7 @@
The two fact scans were identical for this module.
</p>
<p class="FactDataError-note" ng-switch-default>
We were not able to find any facts collected for this inventory or module. To setup or run scan jobs, edit the "<a link-to="inventoryEdit" model="{ inventory_id: inventory }">{{inventory.name}}</a>" inventory and select "Scan Job Templates."
We were not able to find any facts collected for this inventory or module. To setup or run scan jobs, edit the "<a link-to="inventoryEdit" model="{ inventory_id: inventory }">{{inventory.name}}</a>" inventory and check "Store Ansible Facts."
</p>
</section>
<fact-data-table ng-if="!error" left-hostname="leftHostname" right-hostname="rightHostname" left-scan-date="leftScanDate" right-scan-date="rightScanDate" left-data-no-scans="leftDataNoScans" right-data-no-scans="rightDataNoScans" is-nested-display="isNestedDisplay"

4
awx/ui/client/src/templates/job-template.form.js
View File

@ -55,13 +55,12 @@ function(NotificationsList, CompletedJobsList, i18n) {
" on the selected hosts."), "<em>run</em>") + "</p> <p>" +
i18n.sprintf(i18n._("Setting the type to %s will not execute the playbook."), "<em>check</em>") + " " +
i18n.sprintf(i18n._("Instead, %s will check playbook " +
" syntax, test environment setup and report problems."), "<code>ansible</code>") + "</p> <p>",
" syntax, test environment setup and report problems."), "<code>ansible</code>") + "</p>",
dataTitle: i18n._('Job Type'),
dataPlacement: 'right',
dataContainer: "body",
subCheckbox: {
variable: 'ask_job_type_on_launch',
ngShow: true,
text: i18n._('Prompt on launch'),
ngDisabled: '!(job_template_obj.summary_fields.user_capabilities.edit || canAddJobTemplate)'
},
@ -88,7 +87,6 @@ function(NotificationsList, CompletedJobsList, i18n) {
subCheckbox: {
variable: 'ask_inventory_on_launch',
ngChange: 'job_template_form.inventory_name.$validate()',
ngShow: true,
text: i18n._('Prompt on launch')
},
ngDisabled: '!(job_template_obj.summary_fields.user_capabilities.edit || canAddJobTemplate)'

6
awx/ui/client/src/templates/job_templates/add-job-template/job-template-add.controller.js
View File

@ -168,12 +168,6 @@
};
$scope.jobTypeChange = function() {
if ($scope.job_type && $scope.project_name === "Default") {
$scope.project_name = null;
$scope.playbook_options = [];
$scope.playbook = "";
$scope.job_template_form.playbook.$setPristine();
}
sync_playbook_select2();
};

6
awx/ui/client/src/templates/job_templates/edit-job-template/job-template-edit.controller.js
View File

@ -127,12 +127,6 @@ export default
};
$scope.jobTypeChange = function() {
if ($scope.job_type && $scope.project_name === "Default") {
$scope.project_name = null;
$scope.playbook_options = [];
$scope.playbook = "";
$scope.job_template_form.playbook.$setPristine();
}
sync_playbook_select2();
};

4
awx/ui/client/src/templates/job_templates/factories/callback-help-init.factory.js
View File

@ -133,10 +133,6 @@ export default
scope.can_edit = data.summary_fields.user_capabilities.edit;
if (scope.job_type.value === "scan" && (!scope.project || scope.project === "") && (!scope.playbook || scope.playbook === "")) {
scope.resetProjectToDefault();
}
scope.$emit('jobTemplateLoaded', data.related.cloud_credential, master);
})
.error(function (data, status) {