ZhouXY108/wisemapping-open-source
1
1
Fork 0
mirror of https://github.com/wisemapping/wisemapping-open-source.git synced 2025-04-19 02:05:32 +08:00
Code Issues Packages Projects Releases Wiki Activity

Bug WISE-122 fixed.

Browse Source 
Display proper message for change password for account based on OpenId.
This commit is contained in:
Paulo Gustavo Veiga 2014-01-16 01:21:40 -03:00
parent 22c102917e
commit 023e4b8f9f
6 changed files with 14 additions and 1496 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

51
projectFilesBackup/wise-editor/wise-editor.iml
View File

@ -1,51 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<module relativePaths="false" type="J2EE_WEB_MODULE" version="4">
<component name="FacetManager">
<facet type="web" name="wise-editor">
<configuration>
<descriptors>
<deploymentDescriptor name="web.xml" url="file://$MODULE_DIR$/src/main/webapp/WEB-INF/web.xml" />
</descriptors>
<webroots>
<root url="file://$MODULE_DIR$/src/main/webapp" relative="/" />
</webroots>
</configuration>
</facet>
</component>
<component name="NewModuleRootManager" inherit-compiler-output="false">
<output url="file://$MODULE_DIR$/target/classes" />
<output-test url="file://$MODULE_DIR$/target/test-classes" />
<exclude-output />
<content url="file://$MODULE_DIR$">
<sourceFolder url="file://$MODULE_DIR$/src/main/resources" isTestSource="false" />
<excludeFolder url="file://$MODULE_DIR$/target" />
</content>
<orderEntry type="inheritedJdk" />
<orderEntry type="sourceFolder" forTests="false" />
<orderEntry type="module" module-name="core-js" />
<orderEntry type="module" module-name="mindplot" />
<orderEntry type="module" module-name="web2d" />
</component>
<component name="WebModuleBuildComponent">
<setting name="EXPLODED_URL" value="file://$MODULE_DIR$/target/wise-editor" />
</component>
<component name="WebModuleProperties">
<containerElement type="module" name="core-js">
<attribute name="method" value="5" />
<attribute name="URI" value="/WEB-INF/lib/core-js-3.0-SNAPSHOT.jar" />
</containerElement>
<containerElement type="module" name="mindplot">
<attribute name="method" value="5" />
<attribute name="URI" value="/WEB-INF/lib/mindplot-3.0-SNAPSHOT.jar" />
</containerElement>
<containerElement type="module" name="web2d">
<attribute name="method" value="5" />
<attribute name="URI" value="/WEB-INF/lib/web2d-3.0-SNAPSHOT.jar" />
</containerElement>
<deploymentDescriptor version="2.3" name="web.xml" optional="false" url="file://$MODULE_DIR$/src/main/webapp/WEB-INF/web.xml" />
<webroots>
<root relative="/" url="file://$MODULE_DIR$/src/main/webapp" />
</webroots>
</component>
</module>

1444
projectFilesBackup/wise-webapp/wise-webapp.iml
View File

File diff suppressed because it is too large Load Diff

2
wise-webapp/src/main/java/com/wisemapping/webmvc/UsersController.java
View File

@ -78,7 +78,7 @@ public class UsersController {
result = new ModelAndView("forgotPasswordError");
}
catch (InvalidAuthSchemaException e) {
result = new ModelAndView("forgotPasswordError");
result = new ModelAndView("userForgotPasswordOpenId");
}
return result;
}

2
wise-webapp/src/main/resources/messages_en.properties
View File

@ -267,6 +267,8 @@ OPEN_OFFICE_EXPORT_FORMAT_DETAILS=Get your map as OpenOffice Write Document
MINDJET_EXPORT_FORMAT=(BETA) MindJet 8.x
MINDJET_EXPORT_FORMAT_DETAILS=Export your maps in MindJet 8.x format
MINDMAP_IS_LOCKED=Mindmap is locked for edition.
OPENID_ACCOUNT_PASSWORD=Registered OpenID account password could not be changed
OPENID_ACCOUNT_PASSWORD_DETAIL=Your account has been registered using OpenId. Try to login using either your Google, AOL or Yahoo account.

5
wise-webapp/src/main/webapp/WEB-INF/defs/definitions.xml
View File

@ -63,6 +63,11 @@
<put-attribute name="body" value="/jsp/userForgotPasswordError.jsp"/>
</definition>
<definition name="userForgotPasswordOpenId" extends="errorTemplate">
<put-attribute name="title" value="OPENID_ACCOUNT_PASSWORD"/>
<put-attribute name="body" value="/jsp/userForgotPasswordOpenId.jsp"/>
</definition>
<definition name="forgotPasswordSuccess" extends="errorTemplate">
<put-attribute name="title" value="FORGOT_PASSWORD"/>
<put-attribute name="body" value="/jsp/userForgotPasswordSuccess.jsp"/>

6
wise-webapp/src/main/webapp/jsp/userForgotPasswordOpenId.jsp Executable file
View File

@ -0,0 +1,6 @@
<%@page pageEncoding="UTF-8" %>
<%@include file="/jsp/init.jsp" %>
<h2><spring:message code="OPENID_ACCOUNT_PASSWORD"/></h2>
<p><spring:message code="OPENID_ACCOUNT_PASSWORD_DETAIL"/></p>