499713d04dda72f9aacda0e5cadc4fc51255be92
java/com.sap.sailing.selenium.test/src/com/sap/sailing/selenium/pages/adminconsole/usermanagement/UserManagementPanelPO.java
| ... | ... | @@ -187,8 +187,6 @@ public class UserManagementPanelPO extends PageArea { |
| 187 | 187 | final WebElement action = ActionsHelper.findUnlockAction(entry.getWebElement()); |
| 188 | 188 | action.click(); |
| 189 | 189 | } |
| 190 | - waitUntilAlertIsPresent(); |
|
| 191 | - driver.switchTo().alert().accept(); |
|
| 192 | 190 | } |
| 193 | 191 | |
| 194 | 192 | public void waitUntilUserFound(String userName) { |
java/com.sap.sse.security.ui/src/main/java/com/sap/sse/security/ui/client/usermanagement/UserTableWrapper.java
| ... | ... | @@ -32,6 +32,8 @@ import com.sap.sse.common.Util; |
| 32 | 32 | import com.sap.sse.common.util.NaturalComparator; |
| 33 | 33 | import com.sap.sse.gwt.client.DateAndTimeFormatterUtil; |
| 34 | 34 | import com.sap.sse.gwt.client.ErrorReporter; |
| 35 | +import com.sap.sse.gwt.client.Notification; |
|
| 36 | +import com.sap.sse.gwt.client.Notification.NotificationType; |
|
| 35 | 37 | import com.sap.sse.gwt.client.celltable.AbstractSortableTextColumn; |
| 36 | 38 | import com.sap.sse.gwt.client.celltable.CellTableWithCheckboxResources; |
| 37 | 39 | import com.sap.sse.gwt.client.celltable.EntityIdentityComparator; |
| ... | ... | @@ -259,7 +261,7 @@ extends TableWrapper<UserDTO, S, StringMessages, TR> { |
| 259 | 261 | getUserManagementWriteService().unlockUser(userName, new AsyncCallback<SuccessInfo>() { |
| 260 | 262 | @Override |
| 261 | 263 | public void onSuccess(SuccessInfo result) { |
| 262 | - Window.alert(stringMessages.unlockSucceededForUser(userName)); |
|
| 264 | + Notification.notify(stringMessages.unlockSucceededForUser(userName), NotificationType.SUCCESS); |
|
| 263 | 265 | final List<UserDTO> usersWithUpdatedEntry = new ArrayList<UserDTO>(); |
| 264 | 266 | for (UserDTO user : getAllUsers()) { |
| 265 | 267 | if (user.getFullName() == selectedUser.getFullName()) { |
| ... | ... | @@ -273,13 +275,13 @@ extends TableWrapper<UserDTO, S, StringMessages, TR> { |
| 273 | 275 | |
| 274 | 276 | @Override |
| 275 | 277 | public void onFailure(Throwable caught) { |
| 276 | - Window.alert(stringMessages.unlockFailedForUser(userName)); |
|
| 278 | + Notification.notify(stringMessages.unlockFailedForUser(userName), NotificationType.ERROR); |
|
| 277 | 279 | errorReporter.reportError(caught.getMessage()); |
| 278 | 280 | } |
| 279 | 281 | }); |
| 280 | 282 | } |
| 281 | 283 | } else { |
| 282 | - Window.alert(stringMessages.userIsAlreadyUnlocked()); |
|
| 284 | + Notification.notify(stringMessages.userIsAlreadyUnlocked(), NotificationType.INFO); |
|
| 283 | 285 | } |
| 284 | 286 | }; |
| 285 | 287 | } |