mirror of
https://bitbucket.org/wisemapping/wisemapping-open-source.git
synced 2024-09-12 07:10:07 +02:00
Fix mindmap expport.
This commit is contained in:
parent
f52f01a6b1
commit
bed005afef
@ -45,7 +45,7 @@ public abstract class BaseSecurityAdvice {
|
||||
}
|
||||
|
||||
if (!isAllowed) {
|
||||
throw new AccessDeniedSecurityException("User '" + user.getEmail() + "' not allowed to invoke:" + methodInvocation);
|
||||
throw new AccessDeniedSecurityException("User '" + (user != null ? user.getEmail() : "none") + "' not allowed to invoke:" + methodInvocation);
|
||||
}
|
||||
}
|
||||
|
||||
|
@ -30,7 +30,6 @@
|
||||
<sec:http pattern="/c/search.htm" security="none"/>
|
||||
<sec:http pattern="/c/keyboard.htm" security="none"/>
|
||||
<sec:http pattern="/c/embeddedview.htm" security="none"/>
|
||||
<sec:http pattern="/c/export.htm" security="none"/>
|
||||
<sec:http pattern="/c/publicview.htm" security="none"/>
|
||||
<sec:http pattern="/service/transform*" security="none"/>
|
||||
|
||||
@ -45,7 +44,7 @@
|
||||
<sec:form-login login-page="/c/login.htm" 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"/>
|
||||
<sec:remember-me key="rememberMeKey" user-service-ref="userDetailsService"/>
|
||||
<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:http>
|
||||
|
||||
|
@ -1,24 +1,15 @@
|
||||
<%@ include file="/jsp/init.jsp" %>
|
||||
<script type="text/javascript">
|
||||
if(typeof isOldIE != "undefined"){
|
||||
window.onload = function() {
|
||||
var simpleButtonGenerator = RUZEE.ShadedBorder.create({ corner:8, border:1 });
|
||||
simpleButtonGenerator.render('login');
|
||||
<%--@elvariable id="isHsql" type="boolean"--%>
|
||||
|
||||
$('submitButton').onclick = displayLoading;
|
||||
};
|
||||
}
|
||||
</script>
|
||||
<%@ include file="/jsp/init.jsp" %>
|
||||
|
||||
<div id="loginContent">
|
||||
|
||||
<div id="news" class="sb">
|
||||
<h1>What is New: </h1>
|
||||
<ul>
|
||||
<li>Links Between Nodes</li>
|
||||
<li>FreeMind 0.9 Update</li>
|
||||
<li>Improved HTML 5.0 Support</li>
|
||||
<li>Firefox 4.0 is officially supported</li>
|
||||
<li>Firefox 6.0 is officially supported</li>
|
||||
</ul>
|
||||
</div>
|
||||
<div id="login" class="sb">
|
||||
@ -29,7 +20,7 @@
|
||||
<form action="<c:url value='/j_spring_security_check'/>" method="POST">
|
||||
<table>
|
||||
<tbody>
|
||||
<c:if test="${not empty param.login_error}">
|
||||
<c:if test="${not empty param.login_error}">
|
||||
<tr>
|
||||
<td>
|
||||
|
||||
@ -45,42 +36,42 @@
|
||||
</c:choose>
|
||||
</td>
|
||||
</tr>
|
||||
</c:if>
|
||||
<tr>
|
||||
<td class="formLabel">
|
||||
<spring:message code="EMAIL"/>:
|
||||
</td>
|
||||
<td>
|
||||
<input type='text' tabindex="1" id="email" name='j_username'/>
|
||||
</td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td class="formLabel">
|
||||
<spring:message code="PASSWORD"/>:
|
||||
</td>
|
||||
<td>
|
||||
<input type='password' tabindex="2" id="password" name='j_password'/>
|
||||
</td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td class="formLabel">
|
||||
<input type="checkbox" id="rememberme" name="_spring_security_remember_me"/>
|
||||
</td>
|
||||
<td>
|
||||
<spring:message code="REMEMBER_ME"/>
|
||||
</td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td> </td>
|
||||
<td>
|
||||
<input type="submit" class="btn-primary" id="submitButton"
|
||||
value="<spring:message code="SIGN_IN"/>">
|
||||
</c:if>
|
||||
<tr>
|
||||
<td class="formLabel">
|
||||
<spring:message code="EMAIL"/>:
|
||||
</td>
|
||||
<td>
|
||||
<input type='text' tabindex="1" id="email" name='j_username'/>
|
||||
</td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td class="formLabel">
|
||||
<spring:message code="PASSWORD"/>:
|
||||
</td>
|
||||
<td>
|
||||
<input type='password' tabindex="2" id="password" name='j_password'/>
|
||||
</td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td class="formLabel">
|
||||
<input type="checkbox" id="rememberme" name="_spring_security_remember_me"/>
|
||||
</td>
|
||||
<td>
|
||||
<spring:message code="REMEMBER_ME"/>
|
||||
</td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td> </td>
|
||||
<td>
|
||||
<input type="submit" class="btn-primary" id="submitButton"
|
||||
value="<spring:message code="SIGN_IN"/>">
|
||||
|
||||
<div style="text-align:right;"><a href="<c:url value="forgotPassword.htm"/>">
|
||||
<spring:message code="FORGOT_PASSWORD"/>
|
||||
</a></div>
|
||||
</td>
|
||||
</tr>
|
||||
<div style="text-align:right;"><a href="<c:url value="forgotPassword.htm"/>">
|
||||
<spring:message code="FORGOT_PASSWORD"/>
|
||||
</a></div>
|
||||
</td>
|
||||
</tr>
|
||||
</tbody>
|
||||
</table>
|
||||
</form>
|
||||
@ -100,5 +91,10 @@
|
||||
<c:if test="${isHsql== 'true'}">
|
||||
|
||||
|
||||
<div style="padding:10px;background-color: #E0EFFF; border-radius: 5px 5px 5px 5px;border-style:solid;border-color:gray"><img src="../images/info.png" style="margin:0px 4px">Note: Although HSQLDB is bundled with WiseMapping by default during the installation, we do not recommend this database for production use. Please consider using MySQL 5.5 instead. You can find more information how to configure MySQL <a href="http://www.wisemapping.org/documentation/configu">here</a>.</div>
|
||||
<div style="padding:10px;background-color: #E0EFFF; border-radius: 5px 5px 5px 5px;border-style:solid;border-color:gray">
|
||||
<img src="../images/info.png" style="margin:0 4px">Note: Although HSQLDB is bundled with WiseMapping by
|
||||
default during the installation, we do not recommend this database for production use. Please consider using
|
||||
MySQL 5.5 instead. You can find more information how to configure MySQL <a
|
||||
href="http://www.wisemapping.org/documentation/configu">here</a>.
|
||||
</div>
|
||||
</c:if>
|
||||
|
@ -40,6 +40,9 @@
|
||||
var userOptions = ${mindmap.properties};
|
||||
options.zoom = userOptions.zoom;
|
||||
|
||||
// Set map id ...
|
||||
options.mapId = mapId;
|
||||
|
||||
// Build designer ...
|
||||
var designer = buildDesigner(options);
|
||||
|
||||
|
@ -112,8 +112,6 @@
|
||||
|
||||
// Finally, submit map ...
|
||||
form.submit();
|
||||
|
||||
|
||||
MooDialog.Request.active.close();
|
||||
});
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user