Merge remote-tracking branch 'origin/master'

Evolveum · Jun 20, 2016 · cd04e0e · cd04e0e
2 parents 74d9c61 + 14d5aa5
commit cd04e0e
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 7 deletions.
diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/users/PageUsers.java b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/users/PageUsers.java
@@ -31,6 +31,7 @@
 import com.evolveum.midpoint.web.component.search.SearchValue;
 import com.evolveum.midpoint.web.session.PageStorage;
 import com.evolveum.midpoint.web.session.SessionStorage;
+import com.evolveum.midpoint.xml.ns._public.common.common_3.*;
 import org.apache.commons.lang3.StringUtils;
 import org.apache.wicket.ajax.AjaxRequestTarget;
 import org.apache.wicket.extensions.markup.html.repeater.data.grid.ICellPopulator;
@@ -73,10 +74,6 @@
 import com.evolveum.midpoint.web.page.admin.users.dto.UsersDto;
 import com.evolveum.midpoint.web.session.UserProfileStorage.TableId;
 import com.evolveum.midpoint.web.util.OnePageParameterEncoder;
-import com.evolveum.midpoint.xml.ns._public.common.common_3.CredentialsType;
-import com.evolveum.midpoint.xml.ns._public.common.common_3.ObjectType;
-import com.evolveum.midpoint.xml.ns._public.common.common_3.PasswordType;
-import com.evolveum.midpoint.xml.ns._public.common.common_3.UserType;
 
 /**
  * @author lazyman
@@ -435,9 +432,9 @@ private void unlockPerformed(AjaxRequestTarget target, UserType selectedUser) {
 				// credentials specified (otherwise this would create
 				// almost-empty password container)
 				ObjectDelta delta = ObjectDelta.createModificationReplaceProperty(
-						UserType.class, user.getOid(), new ItemPath(UserType.F_CREDENTIALS,
-								CredentialsType.F_PASSWORD, PasswordType.F_FAILED_LOGINS),
-						getPrismContext(), 0);
+						UserType.class, user.getOid(), new ItemPath(UserType.F_ACTIVATION,
+                                ActivationType.F_LOCKOUT_STATUS),
+						getPrismContext(), LockoutStatusType.NORMAL);
 				Collection<ObjectDelta<? extends ObjectType>> deltas = WebComponentUtil
 						.createDeltaCollection(delta);
 				getModelService().executeChanges(deltas, null, task, opResult);

diff --git a/gui/admin-gui/src/main/resources/localization/Midpoint.properties b/gui/admin-gui/src/main/resources/localization/Midpoint.properties
@@ -3203,3 +3203,4 @@ LockoutStatusPanel.undoButtonLabel=Undo
 LockoutStatusPanel.unlockButtonLabel=Unlock
 LockoutStatusPanel.changesSaving=(will be applied after Save button click)
 operation.com.evolveum.midpoint.web.page.admin.server.PageTaskEdit.saveTask=Save task (GUI)
+operation.com.evolveum.midpoint.web.page.admin.users.PageUsers.unlockUsers=Unlock user
diff --git a/gui/admin-gui/src/main/resources/localization/Midpoint_en.properties b/gui/admin-gui/src/main/resources/localization/Midpoint_en.properties
@@ -3166,3 +3166,4 @@ LockoutStatusPanel.undoButtonLabel=Undo
 LockoutStatusPanel.unlockButtonLabel=Unlock
 LockoutStatusPanel.changesSaving=(changes will be applied after Save button click)
 operation.com.evolveum.midpoint.web.page.admin.server.PageTaskEdit.saveTask=Save task (GUI)
+operation.com.evolveum.midpoint.web.page.admin.users.PageUsers.unlockUsers=Unlock user