External-Mirrors/awx
2
0
Fork 0
mirror of https://github.com/ansible/awx.git synced 2026-05-19 14:57:39 -02:30
Code Issues Packages Projects Releases Wiki Activity

Inventory edit dialog

Browse Source 
Fixed https://trello.com/c/id6ngxh4/314-odd-wording-on-tower-2-0-dev201408141545-inventory-group-source-overwrite
This commit is contained in:
Chris Houseknecht
2014-08-16 03:13:47 -04:00
parent 92f813aa55
commit c763302c06
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
awx/ui/static/js/forms/Source.js
View File

@@ -93,8 +93,8 @@ angular.module('SourceFormDefinition', [])
ngShow: "source.value !== '' && source.value !== null", ngShow: "source.value !== '' && source.value !== null",
addRequired: false, addRequired: false,
editRequired: false, editRequired: false,
awPopOver: '<p>When checked all child groups and hosts not found on the remote source will be deleted from ' + awPopOver: '<p>If checked, all child groups and hosts not found on the external source will be deleted from ' +
'the local inventory.</p><p>Unchecked any local child hosts and groups not found on the external source will ' + 'the local inventory.</p><p>When not checked, local child hosts and groups not found on the external source will ' +
'remain untouched by the inventory update process.</p>', 'remain untouched by the inventory update process.</p>',
dataTitle: 'Overwrite', dataTitle: 'Overwrite',
dataContainer: 'body', dataContainer: 'body',
@@ -108,7 +108,7 @@ angular.module('SourceFormDefinition', [])
addRequired: false, addRequired: false,
editRequired: false, editRequired: false,
awPopOver: '<p>If checked, all variables for child groups and hosts will be removed and replaced by those ' + awPopOver: '<p>If checked, all variables for child groups and hosts will be removed and replaced by those ' +
'found on the external source.</p><p>When not checked a merge will be performed, combining local variables with ' + 'found on the external source.</p><p>When not checked, a merge will be performed, combining local variables with ' +
'those found on the external source.</p>', 'those found on the external source.</p>',
dataTitle: 'Overwrite Variables', dataTitle: 'Overwrite Variables',
dataContainer: 'body', dataContainer: 'body',