Yair Zaslavsky has uploaded a new change for review.
Change subject: 4. webadmin: Change LoginPopup to present clickable password
URL change
......................................................................
4. webadmin: Change LoginPopup to present clickable password URL change
Change-Id: I502cfcad23c3500f1e87e3f45657cf61e9c36d69
Signed-off-by: Yair Zaslavsky <yzasl...@redhat.com>
---
M
frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/presenter/AbstractLoginPopupPresenterWidget.java
M
frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/view/AbstractLoginPopupView.java
M
frontend/webadmin/modules/userportal-gwtp/src/main/java/org/ovirt/engine/ui/userportal/section/login/view/LoginPopupView.java
M
frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/login/view/LoginPopupView.java
4 files changed, 28 insertions(+), 8 deletions(-)
git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/22/23622/1
diff --git
a/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/presenter/AbstractLoginPopupPresenterWidget.java
b/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/presenter/AbstractLoginPopupPresenterWidget.java
index 8160b27..c2a6d5b 100644
---
a/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/presenter/AbstractLoginPopupPresenterWidget.java
+++
b/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/presenter/AbstractLoginPopupPresenterWidget.java
@@ -32,7 +32,7 @@
void resetAndFocus();
- void setErrorMessage(String text);
+ void setErrorMessageHtml(String text);
void clearErrorMessage();
@@ -83,9 +83,10 @@
@Override
public void eventRaised(Event ev, Object sender, EventArgs args) {
lockInteractionManager.hideLoadingIndicator();
- getView().setErrorMessage(loginModel.getMessage());
+ formatAndSetErrorMessage(loginModel.getMessage());
logger.warning("Login failed for user [" +
loginModel.getUserName().getEntity() + "]"); //$NON-NLS-1$ //$NON-NLS-2$
}
+
});
getView().getLoginButton().setCommand(loginModel.getLoginCommand());
@@ -157,6 +158,21 @@
clientStorage.setLocalItem(getSelectedDomainKey(), selectedItem);
}
+ private void formatAndSetErrorMessage(String message) {
+ if (message != null) {
+ int urlIndex = message.indexOf("http");//$NON-NLS-1$
+ if (urlIndex != -1) { //$NON-NLS-1$
+ String beforeURL = message.substring(0, urlIndex);
+ String url = message.substring(urlIndex);
+ StringBuilder htmlPart = new StringBuilder();
+ htmlPart.append(beforeURL)
+ .append("<a href=\"").append(url).append("\"
target=\"_blank\">").append(url).append("</a>"); //$NON-NLS-1$ //$NON-NLS-2$
//$NON-NLS-3$
+ message = htmlPart.toString();
+ }
+ }
+ getView().setErrorMessageHtml(message);
+ }
+
@Override
protected void onReset() {
super.onReset();
diff --git
a/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/view/AbstractLoginPopupView.java
b/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/view/AbstractLoginPopupView.java
index 7dd2795..82b917b 100644
---
a/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/view/AbstractLoginPopupView.java
+++
b/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/view/AbstractLoginPopupView.java
@@ -111,4 +111,8 @@
asWidget().setKeyPressHandler(keyPressHandler);
}
+ protected void setErrorMessageLabel(Label errorMessage, String text) {
+ errorMessage.getElement().setInnerHTML(text);
+ }
+
}
diff --git
a/frontend/webadmin/modules/userportal-gwtp/src/main/java/org/ovirt/engine/ui/userportal/section/login/view/LoginPopupView.java
b/frontend/webadmin/modules/userportal-gwtp/src/main/java/org/ovirt/engine/ui/userportal/section/login/view/LoginPopupView.java
index fd2d1ae..89c21fc 100644
---
a/frontend/webadmin/modules/userportal-gwtp/src/main/java/org/ovirt/engine/ui/userportal/section/login/view/LoginPopupView.java
+++
b/frontend/webadmin/modules/userportal-gwtp/src/main/java/org/ovirt/engine/ui/userportal/section/login/view/LoginPopupView.java
@@ -245,8 +245,8 @@
}
@Override
- public void setErrorMessage(String text) {
- errorMessage.setText(text);
+ public void setErrorMessageHtml(String text) {
+ setErrorMessageLabel(errorMessage, text);
errorMessage.setVisible(text != null);
if (errorMessage.isVisible()) {
errorMessagePanel.setVisible(true);
@@ -258,7 +258,7 @@
@Override
public void clearErrorMessage() {
- setErrorMessage(null);
+ setErrorMessageHtml(null);
}
@Override
diff --git
a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/login/view/LoginPopupView.java
b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/login/view/LoginPopupView.java
index 32e37dc..24674d8 100644
---
a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/login/view/LoginPopupView.java
+++
b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/login/view/LoginPopupView.java
@@ -163,8 +163,8 @@
}
@Override
- public void setErrorMessage(String text) {
- errorMessage.setText(text);
+ public void setErrorMessageHtml(String text) {
+ setErrorMessageLabel(errorMessage, text);
errorMessage.setVisible(text != null);
if (errorMessage.isVisible()) {
errorMessagePanel.setVisible(true);
@@ -173,7 +173,7 @@
@Override
public void clearErrorMessage() {
- setErrorMessage(null);
+ setErrorMessageHtml(null);
}
@Override
--
To view, visit http://gerrit.ovirt.org/23622
To unsubscribe, visit http://gerrit.ovirt.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I502cfcad23c3500f1e87e3f45657cf61e9c36d69
Gerrit-PatchSet: 1
Gerrit-Project: ovirt-engine
Gerrit-Branch: ovirt-engine-3.4
Gerrit-Owner: Yair Zaslavsky <yzasl...@redhat.com>
_______________________________________________
Engine-patches mailing list
Engine-patches@ovirt.org
http://lists.ovirt.org/mailman/listinfo/engine-patches
