diff --git a/java/com.sap.sailing.gwt.ui/SailingGWT.launch b/java/com.sap.sailing.gwt.ui/SailingGWT.launch
index 73d56a46e20..1ec4c279c3b 100755
--- a/java/com.sap.sailing.gwt.ui/SailingGWT.launch
+++ b/java/com.sap.sailing.gwt.ui/SailingGWT.launch
@@ -50,7 +50,7 @@
-
+
diff --git a/java/com.sap.sse.security.ui/src/main/java/com/sap/sse/security/ui/client/component/UserDetailsView.java b/java/com.sap.sse.security.ui/src/main/java/com/sap/sse/security/ui/client/component/UserDetailsView.java
index 4d53bef116e..0346c7a8c52 100644
--- a/java/com.sap.sse.security.ui/src/main/java/com/sap/sse/security/ui/client/component/UserDetailsView.java
+++ b/java/com.sap.sse.security.ui/src/main/java/com/sap/sse/security/ui/client/component/UserDetailsView.java
@@ -233,6 +233,8 @@ public class UserDetailsView extends FlowPanel {
}
private static class DeleteUserConfimDialog extends DialogBox {
+ final Button ok;
+
public DeleteUserConfimDialog(final UserManagementServiceAsync userManagementService, final String username, final StringMessages stringMessages) {
setText(stringMessages.deleteUserQuestion());
setAnimationEnabled(true);
@@ -240,7 +242,7 @@ public class UserDetailsView extends FlowPanel {
VerticalPanel vp = new VerticalPanel();
vp.add(new Label(stringMessages.doYouReallyWantToDeleteUser(username)));
HorizontalPanel hp = new HorizontalPanel();
- Button ok = new Button(stringMessages.ok());
+ ok = new Button(stringMessages.ok());
ok.addClickHandler(new ClickHandler() {
public void onClick(ClickEvent event) {
userManagementService.deleteUser(username, new AsyncCallback() {
@@ -268,6 +270,14 @@ public class UserDetailsView extends FlowPanel {
vp.add(hp);
setWidget(vp);
}
+
+ @Override
+ public void show() {
+ super.show();
+ ok.setFocus(true);
+ }
+
+
}
public void addUserChangeEventHandler(UserChangeEventHandler handler) {
diff --git a/java/com.sap.sse.security.ui/src/main/resources/com/sap/sse/security/ui/EmailValidation.gwt.xml b/java/com.sap.sse.security.ui/src/main/resources/com/sap/sse/security/ui/EmailValidation.gwt.xml
index ea6a2a8356b..ce5b8ef2dfd 100755
--- a/java/com.sap.sse.security.ui/src/main/resources/com/sap/sse/security/ui/EmailValidation.gwt.xml
+++ b/java/com.sap.sse.security.ui/src/main/resources/com/sap/sse/security/ui/EmailValidation.gwt.xml
@@ -29,7 +29,7 @@
-
+
@@ -44,7 +44,7 @@
-
+
diff --git a/java/com.sap.sse.security/src/com/sap/sse/security/SecurityServiceImpl.java b/java/com.sap.sse.security/src/com/sap/sse/security/SecurityServiceImpl.java
index 097b3d35961..8ddad48dff9 100644
--- a/java/com.sap.sse.security/src/com/sap/sse/security/SecurityServiceImpl.java
+++ b/java/com.sap.sse.security/src/com/sap/sse/security/SecurityServiceImpl.java
@@ -279,7 +279,9 @@ public class SecurityServiceImpl extends RemoteServiceServlet implements Securit
if (user == null) {
throw new UserManagementException(UserManagementException.USER_DOES_NOT_EXIST);
}
- return user.validate(validationSecret);
+ final boolean result = user.validate(validationSecret);
+ store.updateUser(user);
+ return result;
}
/**
diff --git a/java/com.sap.sse.security/src/com/sap/sse/security/User.java b/java/com.sap.sse.security/src/com/sap/sse/security/User.java
index 092133bb3de..81a5a25d34d 100644
--- a/java/com.sap.sse.security/src/com/sap/sse/security/User.java
+++ b/java/com.sap.sse.security/src/com/sap/sse/security/User.java
@@ -127,7 +127,9 @@ public class User {
*/
public boolean validate(final String validationSecret) {
final boolean result;
- if (this.validationSecret.equals(validationSecret)) {
+ if (emailValidated) {
+ result = true;
+ } else if (validationSecret.equals(this.validationSecret)) {
emailValidated = true;
this.validationSecret = null;
result = true;
diff --git a/java/target/configuration/security.properties b/java/target/configuration/security.properties
index 2e7b335596f..7b28d470fc2 100644
--- a/java/target/configuration/security.properties
+++ b/java/target/configuration/security.properties
@@ -1,8 +1,8 @@
# mail configuration, e.g., for password recovery
mail.enabled = false
-mail.from = axel.uhl@sap.com
+mail.from = uhl@homemp3.dyndns.org
mail.transport.protocol = smtp
-mail.smtp.host = mail.sap.corp
+mail.smtp.host = klo.axeluhl.de
#mail.smtp.host = 127.0.0.1
mail.smtp.port = 25
mail.smtp.auth = true