From c763302c06513fc6b36e437f132678fe9135c104 Mon Sep 17 00:00:00 2001 From: Chris Houseknecht Date: Sat, 16 Aug 2014 03:13:47 -0400 Subject: [PATCH] Inventory edit dialog Fixed https://trello.com/c/id6ngxh4/314-odd-wording-on-tower-2-0-dev201408141545-inventory-group-source-overwrite --- awx/ui/static/js/forms/Source.js | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/awx/ui/static/js/forms/Source.js b/awx/ui/static/js/forms/Source.js index 960748455c..186943a385 100644 --- a/awx/ui/static/js/forms/Source.js +++ b/awx/ui/static/js/forms/Source.js @@ -93,8 +93,8 @@ angular.module('SourceFormDefinition', []) ngShow: "source.value !== '' && source.value !== null", addRequired: false, editRequired: false, - awPopOver: '

When checked all child groups and hosts not found on the remote source will be deleted from ' + - 'the local inventory.

Unchecked any local child hosts and groups not found on the external source will ' + + awPopOver: '

If checked, all child groups and hosts not found on the external source will be deleted from ' + + 'the local inventory.

When not checked, local child hosts and groups not found on the external source will ' + 'remain untouched by the inventory update process.

', dataTitle: 'Overwrite', dataContainer: 'body', @@ -108,7 +108,7 @@ angular.module('SourceFormDefinition', []) addRequired: false, editRequired: false, awPopOver: '

If checked, all variables for child groups and hosts will be removed and replaced by those ' + - 'found on the external source.

When not checked a merge will be performed, combining local variables with ' + + 'found on the external source.

When not checked, a merge will be performed, combining local variables with ' + 'those found on the external source.

', dataTitle: 'Overwrite Variables', dataContainer: 'body',