Author: ilgrosso
Date: Mon Sep 22 14:39:29 2014
New Revision: 1626793
URL: http://svn.apache.org/r1626793
Log:
[SYNCOPE-135] Merge from 1_2_X
Added:
syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/RequestPasswordResetModalPage.java
- copied unchanged from r1626792,
syncope/branches/1_2_X/console/src/main/java/org/apache/syncope/console/pages/RequestPasswordResetModalPage.java
syncope/trunk/console/src/main/resources/org/apache/syncope/console/pages/RequestPasswordResetModalPage.html
- copied unchanged from r1626792,
syncope/branches/1_2_X/console/src/main/resources/org/apache/syncope/console/pages/RequestPasswordResetModalPage.html
syncope/trunk/console/src/main/resources/org/apache/syncope/console/pages/RequestPasswordResetModalPage.properties
- copied unchanged from r1626792,
syncope/branches/1_2_X/console/src/main/resources/org/apache/syncope/console/pages/RequestPasswordResetModalPage.properties
syncope/trunk/console/src/main/resources/org/apache/syncope/console/pages/RequestPasswordResetModalPage_it.properties
- copied unchanged from r1626792,
syncope/branches/1_2_X/console/src/main/resources/org/apache/syncope/console/pages/RequestPasswordResetModalPage_it.properties
syncope/trunk/console/src/main/resources/org/apache/syncope/console/pages/RequestPasswordResetModalPage_pt_BR.properties
- copied unchanged from r1626792,
syncope/branches/1_2_X/console/src/main/resources/org/apache/syncope/console/pages/RequestPasswordResetModalPage_pt_BR.properties
Modified:
syncope/trunk/ (props changed)
syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/Login.java
syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/UserSelfModalPage.java
Propchange: syncope/trunk/
------------------------------------------------------------------------------
Merged /syncope/branches/1_2_X:r1626769-1626792
Modified:
syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/Login.java
URL:
http://svn.apache.org/viewvc/syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/Login.java?rev=1626793&r1=1626792&r2=1626793&view=diff
==============================================================================
---
syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/Login.java
(original)
+++
syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/Login.java
Mon Sep 22 14:39:29 2014
@@ -217,7 +217,7 @@ public class Login extends WebPage {
// anonymous authentication needed for password
reset request
authenticate(anonymousUser, anonymousKey);
- return null;
+ return new
RequestPasswordResetModalPage(pwdResetModalWin);
}
});
Modified:
syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/UserSelfModalPage.java
URL:
http://svn.apache.org/viewvc/syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/UserSelfModalPage.java?rev=1626793&r1=1626792&r2=1626793&view=diff
==============================================================================
---
syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/UserSelfModalPage.java
(original)
+++
syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/UserSelfModalPage.java
Mon Sep 22 14:39:29 2014
@@ -23,7 +23,6 @@ import org.apache.syncope.common.mod.Use
import org.apache.syncope.common.to.UserTO;
import org.apache.syncope.common.util.AttributableOperations;
import org.apache.syncope.console.rest.UserSelfRestClient;
-import org.apache.syncope.console.wicket.markup.html.form.AjaxCheckBoxPanel;
import org.apache.wicket.PageReference;
import org.apache.wicket.ajax.AjaxRequestTarget;
import org.apache.wicket.extensions.ajax.markup.html.modal.ModalWindow;
