You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lenya.apache.org by an...@apache.org on 2007/07/16 17:52:33 UTC
svn commit: r556656 - in /lenya/trunk/src/modules-core/usecase:
templates/error.jx usecases.js
Author: andreas
Date: Mon Jul 16 08:52:31 2007
New Revision: 556656
URL: http://svn.apache.org/viewvc?view=rev&rev=556656
Log:
Return after showing error screen (fixes bug 42909), improve error screen layout.
Modified:
lenya/trunk/src/modules-core/usecase/templates/error.jx
lenya/trunk/src/modules-core/usecase/usecases.js
Modified: lenya/trunk/src/modules-core/usecase/templates/error.jx
URL: http://svn.apache.org/viewvc/lenya/trunk/src/modules-core/usecase/templates/error.jx?view=diff&rev=556656&r1=556655&r2=556656
==============================================================================
--- lenya/trunk/src/modules-core/usecase/templates/error.jx (original)
+++ lenya/trunk/src/modules-core/usecase/templates/error.jx Mon Jul 16 08:52:31 2007
@@ -26,27 +26,9 @@
<jx:set var="pubId" value="${usecase.getParameterAsString('publicationId')}"/>
<page:title>
- <jx:choose>
- <jx:when test="${usecase.getParameter('currentUser') != null}">
- <i18n:text>Access Denied</i18n:text>
- </jx:when>
- <jx:otherwise>
- <i18n:translate>
- <i18n:text i18n:key="login-to-pub"/>
- <i18n:param><jx:out value="${pubId.toUpperCase()}"/></i18n:param>
- </i18n:translate>
- </jx:otherwise>
- </jx:choose>
+ <i18n:text>could-not-execute-usecase</i18n:text>
</page:title>
<page:body>
-
- <div class="lenya-box">
- <div class="lenya-box-title">
- <i18n:text>Error</i18n:text>
- </div>
-
- <jx:import uri="fallback://lenya/modules/usecase/templates/messages.jx"/>
-
- </div>
+ <jx:import uri="fallback://lenya/modules/usecase/templates/messages.jx"/>
</page:body>
</page:page>
Modified: lenya/trunk/src/modules-core/usecase/usecases.js
URL: http://svn.apache.org/viewvc/lenya/trunk/src/modules-core/usecase/usecases.js?view=diff&rev=556656&r1=556655&r2=556656
==============================================================================
--- lenya/trunk/src/modules-core/usecase/usecases.js (original)
+++ lenya/trunk/src/modules-core/usecase/usecases.js Mon Jul 16 08:52:31 2007
@@ -366,7 +366,7 @@
proxy.setup(usecase);
passRequestParameters(usecase);
usecase.checkExecutionConditions();
- var hasErrors = usecase.hasErrors()
+ var hasErrors = usecase.hasErrors();
if (!hasErrors) {
state = executeFlow(usecase);
hasErrors = usecase.hasErrors();
@@ -375,6 +375,7 @@
if (hasErrors) {
proxy = new Packages.org.apache.lenya.cms.usecase.impl.UsecaseProxy(usecase);
cocoon.sendPage("usecases-view/nomenu/modules/usecase/templates/error.jx", { "usecase" : proxy});
+ return;
}
}
//getTargetURL takes a boolean that is true on success:
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@lenya.apache.org
For additional commands, e-mail: commits-help@lenya.apache.org