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

Fix login redirection when there is not enoght permisions.

Browse Source
This commit is contained in:
Paulo Gustavo Veiga 2012-04-05 00:25:34 -03:00
parent bed005afef
commit 4c634fefec
3 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
wise-editor/src/main/webapp/c/export.htm
View File

@ -109,8 +109,6 @@
// Finally, submit map ... // Finally, submit map ...
form.submit(); form.submit();
MooDialog.Request.active.close(); MooDialog.Request.active.close();
}); });

6
wise-editor/src/main/webapp/js/editor.js
View File

@ -26,13 +26,13 @@ function buildDesigner(options) {
// Register load events ... // Register load events ...
designer = new mindplot.Designer(options, container); designer = new mindplot.Designer(options, container);
designer.addEvent('loadSuccess', function() { designer.addEvent('loadSuccess', function() {
window.waitDialog.close.delay(1000,window.waitDialog); window.waitDialog.close.delay(1000, window.waitDialog);
window.waitDialog = null; window.waitDialog = null;
}); });
window.onerror = function(e) { window.onerror = function(e) {
if (window.waitDialog) { if (window.waitDialog) {
window.waitDialog.close.delay(1000,window.waitDialog); window.waitDialog.close.delay(1000, window.waitDialog);
window.waitDialog = null; window.waitDialog = null;
} }
errorDialog.show(); errorDialog.show();
@ -56,7 +56,7 @@ function buildDesigner(options) {
// Register toolbar event ... // Register toolbar event ...
if ($('toolbar')) { if ($('toolbar')) {
var menu = new mindplot.widget.Menu(designer, 'toolbar', ""); var menu = new mindplot.widget.Menu(designer, 'toolbar', options.mapId, "");
// If a node has focus, focus can be move to another node using the keys. // If a node has focus, focus can be move to another node using the keys.
designer._cleanScreen = function() { designer._cleanScreen = function() {

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

@ -39,12 +39,13 @@
<sec:http-basic/> <sec:http-basic/>
</sec:http> </sec:http>
<sec:http use-expressions="true"> <sec:http use-expressions="true" access-denied-page="/c/login.htm">
<sec:intercept-url pattern="/c/*.htm" access="isFullyAuthenticated()"/> <sec:intercept-url pattern="/c/*.htm" access="isFullyAuthenticated()"/>
<sec:form-login login-page="/c/login.htm" default-target-url='/c/mymaps.htm' <sec:form-login login-page="/c/login.htm"
always-use-default-target='true' authentication-failure-url="/c/login.htm?login_error=2" default-target-url='/c/mymaps.htm'
always-use-default-target='true'
authentication-failure-url="/c/login.htm?login_error=2"
login-processing-url="/j_spring_security_check"/> login-processing-url="/j_spring_security_check"/>
<sec:remember-me key="_spring_security_remember_me" user-service-ref="userDetailsService"/>
<sec:logout logout-url="/c/logout.htm" invalidate-session="true" logout-success-url="/c/login.htm"/> <sec:logout logout-url="/c/logout.htm" invalidate-session="true" logout-success-url="/c/login.htm"/>
</sec:http> </sec:http>
@ -62,4 +63,5 @@
<property name="userManager" ref="userManager"/> <property name="userManager" ref="userManager"/>
<property name="adminUser" value="${admin.user}"/> <property name="adminUser" value="${admin.user}"/>
</bean> </bean>
</beans> </beans>