Yair Zaslavsky has uploaded a new change for review. Change subject: tools: Warning about last domain deletion should be prior to confirmation ......................................................................
tools: Warning about last domain deletion should be prior to confirmation The following patch moves the warning print aobut last domain erasure prior to the confirmation question. In case of forceDelete option is used - this warning is not presented. Bug-Url: https://bugzilla.redhat.com/905370 Change-Id: Id91bd35ad832a4c8b8947c0e86bc0679cef3fa7b Signed-off-by: Yair Zaslavsky<[email protected]> --- M backend/manager/modules/utils/src/main/java/org/ovirt/engine/core/utils/kerberos/ManageDomains.java 1 file changed, 6 insertions(+), 4 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/00/11800/1 diff --git a/backend/manager/modules/utils/src/main/java/org/ovirt/engine/core/utils/kerberos/ManageDomains.java b/backend/manager/modules/utils/src/main/java/org/ovirt/engine/core/utils/kerberos/ManageDomains.java index 2a89bee..f935cbf 100644 --- a/backend/manager/modules/utils/src/main/java/org/ovirt/engine/core/utils/kerberos/ManageDomains.java +++ b/backend/manager/modules/utils/src/main/java/org/ovirt/engine/core/utils/kerberos/ManageDomains.java @@ -919,15 +919,17 @@ throw new ManageDomainsResult(ManageDomainsResultEnum.DOMAIN_DOESNT_EXIST_IN_CONFIGURATION, domainName); } + //Prompt warning about last domain only if not "force delete", as using + //the force delete option should remove with no confirmation/warning + if (domainNameEntry.getDomainNames().size() == 1 && !forceDelete) { + System.out.println(String.format(WARNING_ABOUT_TO_DELETE_LAST_DOMAIN, domainName)); + } + if(!forceDelete && !confirmDeleteDomain(domainName)) { return; } domainNameEntry.removeValueForDomain(domainName); - - if (domainNameEntry.isEntryEmpty()) { - System.out.println(String.format(WARNING_ABOUT_TO_DELETE_LAST_DOMAIN, domainName)); - } // Assuming we got here, we need to change the configuration of the others as well String currentAdUserNameEntry = configurationProvider.getConfigValue(ConfigValues.AdUserName); -- To view, visit http://gerrit.ovirt.org/11800 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Id91bd35ad832a4c8b8947c0e86bc0679cef3fa7b Gerrit-PatchSet: 1 Gerrit-Project: ovirt-engine Gerrit-Branch: master Gerrit-Owner: Yair Zaslavsky <[email protected]> _______________________________________________ Engine-patches mailing list [email protected] http://lists.ovirt.org/mailman/listinfo/engine-patches
