svnno****@sourc*****
svnno****@sourc*****
2008年 5月 2日 (金) 11:58:58 JST
Revision: 908
http://svn.sourceforge.jp/cgi-bin/viewcvs.cgi?root=pal&view=rev&rev=908
Author: shinsuke
Date: 2008-05-02 11:58:58 +0900 (Fri, 02 May 2008)
Log Message:
-----------
check guid value.
Modified Paths:
--------------
pal-admin-ex/trunk/src/main/java/jp/sf/pal/admin/web/registration/PublicPortalForgottenPasswordCompletedPage.java
pal-admin-ex/trunk/src/main/java/jp/sf/pal/admin/web/registration/PublicPortalForgottenPasswordPage.java
pal-admin-ex/trunk/src/main/java/jp/sf/pal/admin/web/registration/PublicPortalSecretAnswerPage.java
-------------- next part --------------
Modified: pal-admin-ex/trunk/src/main/java/jp/sf/pal/admin/web/registration/PublicPortalForgottenPasswordCompletedPage.java
===================================================================
--- pal-admin-ex/trunk/src/main/java/jp/sf/pal/admin/web/registration/PublicPortalForgottenPasswordCompletedPage.java 2008-05-02 02:55:32 UTC (rev 907)
+++ pal-admin-ex/trunk/src/main/java/jp/sf/pal/admin/web/registration/PublicPortalForgottenPasswordCompletedPage.java 2008-05-02 02:58:58 UTC (rev 908)
@@ -17,11 +17,13 @@
import java.io.Serializable;
-import org.seasar.framework.log.Logger;
+import javax.faces.context.FacesContext;
import jp.sf.pal.common.CommonException;
import jp.sf.pal.common.util.FacesMessageUtil;
+import org.seasar.framework.log.Logger;
+
public class PublicPortalForgottenPasswordCompletedPage extends
AbstractResetPasswordPage implements Serializable {
@@ -38,6 +40,12 @@
}
public Class<?> prerender() {
+ // check guid
+ if (getGuid() == null) {
+ setGuid((String) FacesContext.getCurrentInstance()
+ .getExternalContext().getRequestParameterMap().get("guid"));
+ }
+
if (getGuid() != null) {
try {
getUserRegistrationService().updatePassword(this);
Modified: pal-admin-ex/trunk/src/main/java/jp/sf/pal/admin/web/registration/PublicPortalForgottenPasswordPage.java
===================================================================
--- pal-admin-ex/trunk/src/main/java/jp/sf/pal/admin/web/registration/PublicPortalForgottenPasswordPage.java 2008-05-02 02:55:32 UTC (rev 907)
+++ pal-admin-ex/trunk/src/main/java/jp/sf/pal/admin/web/registration/PublicPortalForgottenPasswordPage.java 2008-05-02 02:58:58 UTC (rev 908)
@@ -38,8 +38,12 @@
}
public Class<?> prerender() {
- setGuid((String) FacesContext.getCurrentInstance().getExternalContext()
- .getRequestParameterMap().get("guid"));
+ // check guid
+ if (getGuid() == null) {
+ setGuid((String) FacesContext.getCurrentInstance()
+ .getExternalContext().getRequestParameterMap().get("guid"));
+ }
+
if (getGuid() != null) {
return PublicPortalForgottenPasswordCompletedPage.class;
}
Modified: pal-admin-ex/trunk/src/main/java/jp/sf/pal/admin/web/registration/PublicPortalSecretAnswerPage.java
===================================================================
--- pal-admin-ex/trunk/src/main/java/jp/sf/pal/admin/web/registration/PublicPortalSecretAnswerPage.java 2008-05-02 02:55:32 UTC (rev 907)
+++ pal-admin-ex/trunk/src/main/java/jp/sf/pal/admin/web/registration/PublicPortalSecretAnswerPage.java 2008-05-02 02:58:58 UTC (rev 908)
@@ -99,8 +99,12 @@
}
public Class<?> prerender() {
- setGuid((String) FacesContext.getCurrentInstance().getExternalContext()
- .getRequestParameterMap().get("guid"));
+ // check guid
+ if (getGuid() == null) {
+ setGuid((String) FacesContext.getCurrentInstance()
+ .getExternalContext().getRequestParameterMap().get("guid"));
+ }
+
if (getGuid() != null) {
return PublicPortalForgottenPasswordCompletedPage.class;
}