vmario/wisemapping-open-source
1
0
Fork 0
mirror of https://bitbucket.org/wisemapping/wisemapping-open-source.git synced 2024-11-05 07:03:24 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fix remember me issue.

Browse Source
This commit is contained in:
Paulo Gustavo Veiga 2012-06-18 01:15:46 -03:00
parent 251ea5edb6
commit d751f2be55
3 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
wise-webapp/src/main/java/com/wisemapping/ncontroller/MindmapController.java
View File

@ -36,7 +36,6 @@ import org.springframework.web.bind.annotation.*;
import org.springframework.web.servlet.ModelAndView; import org.springframework.web.servlet.ModelAndView;
import java.io.IOException; import java.io.IOException;
import java.util.List;
@Controller @Controller
public class MindmapController { public class MindmapController {
@ -177,13 +176,13 @@ public class MindmapController {
@Deprecated @Deprecated
@RequestMapping(value = "publicView", method = RequestMethod.GET) @RequestMapping(value = "publicView", method = RequestMethod.GET)
public String showPublicViewPageLegacy(@RequestParam(required = true) int mapId, @NotNull Model model) throws WiseMappingException { public String showPublicViewPageLegacy(@RequestParam(required = true) int mapId) {
return "redirect:maps/" + mapId + "/public"; return "redirect:maps/" + mapId + "/public";
} }
@Deprecated @Deprecated
@RequestMapping(value = "embeddedView", method = RequestMethod.GET) @RequestMapping(value = "embeddedView", method = RequestMethod.GET)
public String showPublicViewLegacyPage(@RequestParam(required = true) int mapId, @RequestParam(required = false) int zoom, @NotNull Model model) throws WiseMappingException { public String showPublicViewLegacyPage(@RequestParam(required = true) int mapId, @RequestParam(required = false) int zoom) {
return "redirect:maps/" + mapId + "/embed?zoom=" + zoom; return "redirect:maps/" + mapId + "/embed?zoom=" + zoom;
} }

2
wise-webapp/src/main/webapp/WEB-INF/classes/log4j.properties
View File

@ -1,6 +1,6 @@
log4j.rootLogger=WARN, stdout, R log4j.rootLogger=WARN, stdout, R
log4j.logger.com.wisemapping=WARN,stdout,R log4j.logger.com.wisemapping=WARN,stdout,R
log4j.logger.org.springframework=WARN,stdout,R log4j.logger.org.springframework=DEBUG,stdout,R
log4j.logger.org.codehaus.jackson=WARN,stdout,R log4j.logger.org.codehaus.jackson=WARN,stdout,R
log4j.additivity.org.hibernate.SQL=false log4j.additivity.org.hibernate.SQL=false

4
wise-webapp/src/main/webapp/WEB-INF/wisemapping-security.xml
View File

@ -40,12 +40,12 @@
<sec:http use-expressions="true" create-session="never" pattern="/service/**"> <sec:http use-expressions="true" create-session="never" pattern="/service/**">
<sec:intercept-url pattern="/service/admin/users/**" access="isAuthenticated() and hasRole('ROLE_ADMIN')"/> <sec:intercept-url pattern="/service/admin/users/**" access="isAuthenticated() and hasRole('ROLE_ADMIN')"/>
<sec:intercept-url pattern="/service/**" access="isAuthenticated()"/> <sec:intercept-url pattern="/service/**" access="isAuthenticated() and hasRole('ROLE_USER')"/>
<sec:http-basic/> <sec:http-basic/>
</sec:http> </sec:http>
<sec:http use-expressions="true" access-denied-page="/c/login"> <sec:http use-expressions="true" access-denied-page="/c/login">
<sec:intercept-url pattern="/c/**" access="isFullyAuthenticated()"/> <sec:intercept-url pattern="/c/**/*" access="isAuthenticated() and hasRole('ROLE_USER')"/>
<sec:form-login login-page="/c/login" <sec:form-login login-page="/c/login"
default-target-url='/c/maps/' default-target-url='/c/maps/'
always-use-default-target='false' always-use-default-target='false'