Greg Sheremeta has uploaded a new change for review. Change subject: webadmin, userportal: stop special handling of '@' in user name ......................................................................
webadmin, userportal: stop special handling of '@' in user name Simplify login page behavior: send user-name as is (don't parse by '@', etc.), don't disable the Domain drop-down. Change-Id: If7568c98c34e6edbd011949c5bad397aeba7b4ae Bug-Url: https://bugzilla.redhat.com/1112252 Signed-off-by: Greg Sheremeta <[email protected]> --- M frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/LoginModel.java 1 file changed, 4 insertions(+), 45 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/15/31915/1 diff --git a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/LoginModel.java b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/LoginModel.java index ffce974..24dd5b3 100644 --- a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/LoginModel.java +++ b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/LoginModel.java @@ -5,7 +5,6 @@ import org.ovirt.engine.core.common.action.VdcReturnValueBase; import org.ovirt.engine.core.common.businessentities.aaa.DbUser; -import org.ovirt.engine.core.compat.StringHelper; import org.ovirt.engine.ui.frontend.AsyncQuery; import org.ovirt.engine.ui.frontend.Frontend; import org.ovirt.engine.ui.frontend.INewAsyncCallback; @@ -208,44 +207,6 @@ AsyncDataProvider.getAAAProfilesListViaPublic(_asyncQuery); } - @Override - public void eventRaised(Event ev, Object sender, EventArgs args) - { - super.eventRaised(ev, sender, args); - - if (ev.matchesDefinition(EntityModel.entityChangedEventDefinition) && sender == getUserName()) - { - userName_EntityChanged(); - } - } - - private void userName_EntityChanged() - { - getProfile().setIsChangable(getDomainAvailability()); - } - - private boolean getDomainAvailability() - { - // Check whether the user name contains domain part. - boolean hasDomain = getUserNameParts(getUserName().getEntity())[1] != null; - - return !hasDomain; - } - - private String[] getUserNameParts(String value) - { - if (!StringHelper.isNullOrEmpty(value)) - { - int index = value.indexOf('@'); - - // Always return array of two elements representing user name and domain.) - return new String[] { index > -1 ? value.substring(0, index) : value, - index > -1 ? value.substring(index + 1) : null }; - } - - return new String[] { "", null }; //$NON-NLS-1$ - } - public void login() { if (!validate()) @@ -257,9 +218,6 @@ startProgress(null); disableLoginScreen(); - String fullUserName = getUserName().getEntity(); - String[] parts = getUserNameParts(fullUserName); - String domain = parts[1]; AsyncQuery _asyncQuery = new AsyncQuery(); _asyncQuery.setModel(this); _asyncQuery.asyncCallback = new INewAsyncCallback() { @@ -294,9 +252,10 @@ } } }; - Frontend.getInstance().loginAsync(fullUserName, getPassword().getEntity(), - StringHelper.isNullOrEmpty(domain) ? getProfile().getSelectedItem() : domain, true, - _asyncQuery); + + // run the login + Frontend.getInstance().loginAsync(getUserName().getEntity(), getPassword().getEntity(), + getProfile().getSelectedItem(), true, _asyncQuery); } protected void raiseLoggedInEvent() { -- To view, visit http://gerrit.ovirt.org/31915 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: If7568c98c34e6edbd011949c5bad397aeba7b4ae Gerrit-PatchSet: 1 Gerrit-Project: ovirt-engine Gerrit-Branch: ovirt-engine-3.5 Gerrit-Owner: Greg Sheremeta <[email protected]> _______________________________________________ Engine-patches mailing list [email protected] http://lists.ovirt.org/mailman/listinfo/engine-patches
