Yaniv Bronhaim has uploaded a new change for review. Change subject: UI: Locking username field in Add\Edit and reinstall host views ......................................................................
UI: Locking username field in Add\Edit and reinstall host views Until we allow using any username, we keep using 'root' and lock the field. Change-Id: Ieb6e806963ba0a9e3a2add00d6b23ec73aed61b8 Signed-off-by: Yaniv Bronhaim <ybron...@redhat.com> --- M frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/hosts/HostModel.java M frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/hosts/InstallModel.java M frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/host/HostInstallPopupView.java M frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/host/HostPopupView.java 4 files changed, 8 insertions(+), 0 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/99/16999/1 diff --git a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/hosts/HostModel.java b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/hosts/HostModel.java index 75931bc..b715f78 100644 --- a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/hosts/HostModel.java +++ b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/hosts/HostModel.java @@ -864,6 +864,8 @@ getHostPort().setEntity(constants.defaultHostSSHPort()); setUserName(new EntityModel()); getUserName().setEntity(constants.defaultUserName()); + // TODO: remove setIsChangable when configured ssh username is enabled + getUserName().setIsChangable(false); setFetchSshFingerprint(new EntityModel()); getFetchSshFingerprint().setEntity(constants.empty()); setUserPassword(new EntityModel()); diff --git a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/hosts/InstallModel.java b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/hosts/InstallModel.java index 4a6fa0a..32d78c5 100644 --- a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/hosts/InstallModel.java +++ b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/hosts/InstallModel.java @@ -100,6 +100,8 @@ getOverrideIpTables().setEntity(false); setUserName(new EntityModel()); getUserName().setEntity(constants.defaultUserName()); + // TODO: remove setIsChangable when configured ssh username is enabled + getUserName().setIsChangable(false); setPublicKey(new EntityModel()); getPublicKey().setEntity(constants.empty()); fetchPublicKey(); diff --git a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/host/HostInstallPopupView.java b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/host/HostInstallPopupView.java index 5e453e1..75bb68f 100644 --- a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/host/HostInstallPopupView.java +++ b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/host/HostInstallPopupView.java @@ -155,6 +155,8 @@ displayPassPkWindow(false); } }); + // TODO: remove setIsChangable when configured ssh username is enabled + userNameEditor.setEnabled(false); } private void displayPassPkWindow(boolean isPasswordVisible) { diff --git a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/host/HostPopupView.java b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/host/HostPopupView.java index 2d12ff4..e62d56f 100644 --- a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/host/HostPopupView.java +++ b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/host/HostPopupView.java @@ -771,6 +771,8 @@ }); updatePmPanelsVisibility(true); + // TODO: remove setIsChangable when configured ssh username is enabled + userNameEditor.setEnabled(false); externalProviderPanel.setVisible(object.showExternalProviderPanel()); networkProviderTab.setVisible(object.showNetworkProviderTab()); -- To view, visit http://gerrit.ovirt.org/16999 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ieb6e806963ba0a9e3a2add00d6b23ec73aed61b8 Gerrit-PatchSet: 1 Gerrit-Project: ovirt-engine Gerrit-Branch: master Gerrit-Owner: Yaniv Bronhaim <ybron...@redhat.com> _______________________________________________ Engine-patches mailing list Engine-patches@ovirt.org http://lists.ovirt.org/mailman/listinfo/engine-patches