Author: xlawrence
Date: Wed Jun 27 16:27:49 2007
New Revision: 17799
URL: https://svndev.jahia.net/websvn/listing.php?sc=3D1&rev=3D17799&repname=
=3Djahia
Log:
backport fix translating all the languages in the engine when switching lan=
guages
backport improvement and fixes on error display in workflow report
Modified:
trunk/core/src/webapp/jsp/jahia/engines/workflow/adv_workflow.jsp
trunk/core/src/webapp/jsp/jahia/engines/workflow/changeworkflow.jsp
trunk/core/src/webapp/jsp/jahia/engines/workflow/readonly_changeworkflo=
w.jsp
trunk/core/src/webapp/jsp/jahia/engines/workflow/showReport.jsp
Modified: trunk/core/src/webapp/jsp/jahia/engines/workflow/adv_workflow.jsp
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/trunk/core/src/webapp=
/jsp/jahia/engines/workflow/adv_workflow.jsp&rev=3D17799&repname=3Djahia
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- trunk/core/src/webapp/jsp/jahia/engines/workflow/adv_workflow.jsp (orig=
inal)
+++ trunk/core/src/webapp/jsp/jahia/engines/workflow/adv_workflow.jsp Wed J=
un 27 16:27:49 2007
@@ -195,6 +195,10 @@
document.mainForm.action =3D "<%=3DengineUrl%>" + "?screen=3D" + p=
aram;
teleportCaptainFlam(document.mainForm);
}
+
+ function refreshTree() {
+ handleActionChanges('display&display=3D<%=3DactiveTabOption%>&obj=
=3D<%=3DentryPoint%>');
+ }
</script>
=
<ul>
Modified: trunk/core/src/webapp/jsp/jahia/engines/workflow/changeworkflow.j=
sp
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/trunk/core/src/webapp=
/jsp/jahia/engines/workflow/changeworkflow.jsp&rev=3D17799&repname=3Djahia
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- trunk/core/src/webapp/jsp/jahia/engines/workflow/changeworkflow.jsp (or=
iginal)
+++ trunk/core/src/webapp/jsp/jahia/engines/workflow/changeworkflow.jsp Wed=
Jun 27 16:27:49 2007
@@ -20,11 +20,17 @@
org.jahia.services.workflow.WorkflowService,
java.security.Principal,
java.util.*" %>
+<%@ page import=3D"org.jahia.engines.JahiaEngine"%>
+<%@ page import=3D"org.jahia.engines.EngineLanguageHelper"%>
<%@ taglib uri=3D"JahiaLib" prefix=3D"jahia" %>
=
<%
final HashMap engineMap =3D (HashMap) request.getAttribute("org.jahia.=
engines.EngineHashMap");
final ParamBean jParams =3D (ParamBean) request.getAttribute("org.jahi=
a.params.ParamBean");
+ EngineLanguageHelper elh =3D (EngineLanguageHelper) engineMap.get(Jahi=
aEngine.ENGINE_LANGUAGE_HELPER);
+ if (elh !=3D null) {
+ jParams.setCurrentLocale(elh.getCurrentLocale());
+ }
final ContentObject contentObject =3D (ContentObject) engineMap.get("c=
ontentObject");
=
final Integer userNameWidth =3D new Integer(15);
Modified: trunk/core/src/webapp/jsp/jahia/engines/workflow/readonly_changew=
orkflow.jsp
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/trunk/core/src/webapp=
/jsp/jahia/engines/workflow/readonly_changeworkflow.jsp&rev=3D17799&repname=
=3Djahia
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- trunk/core/src/webapp/jsp/jahia/engines/workflow/readonly_changeworkflo=
w.jsp (original)
+++ trunk/core/src/webapp/jsp/jahia/engines/workflow/readonly_changeworkflo=
w.jsp Wed Jun 27 16:27:49 2007
@@ -20,11 +20,17 @@
java.security.Principal,
java.util.*" %>
<%@ page import=3D"org.jahia.services.workflow.ExternalWorkflowInstanceCur=
rentInfos" %>
+<%@ page import=3D"org.jahia.engines.EngineLanguageHelper"%>
+<%@ page import=3D"org.jahia.engines.JahiaEngine"%>
<%@ taglib uri=3D"JahiaLib" prefix=3D"jahia" %>
=
<%
final HashMap engineMap =3D (HashMap) request.getAttribute("org.jahia.=
engines.EngineHashMap");
final ParamBean jParams =3D (ParamBean) request.getAttribute("org.jahi=
a.params.ParamBean");
+ EngineLanguageHelper elh =3D (EngineLanguageHelper) engineMap.get(Jahi=
aEngine.ENGINE_LANGUAGE_HELPER);
+ if (elh !=3D null) {
+ jParams.setCurrentLocale(elh.getCurrentLocale());
+ }
=
final Integer userNameWidth =3D new Integer(15);
request.getSession().setAttribute("userNameWidth", userNameWidth);
Modified: trunk/core/src/webapp/jsp/jahia/engines/workflow/showReport.jsp
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/trunk/core/src/webapp=
/jsp/jahia/engines/workflow/showReport.jsp&rev=3D17799&repname=3Djahia
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- trunk/core/src/webapp/jsp/jahia/engines/workflow/showReport.jsp (origin=
al)
+++ trunk/core/src/webapp/jsp/jahia/engines/workflow/showReport.jsp Wed Jun=
27 16:27:49 2007
@@ -14,31 +14,42 @@
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. =
See the License for the specific language governing permissions and =
limitations under the License.
---%><%@ page import=3D"org.jahia.content.ContentObject"%>
-<%@ page import=3D"org.jahia.content.JahiaObject"%>
-<%@ page import=3D"org.jahia.content.ObjectKey"%>
+--%>
+<%@ page import=3D"org.jahia.data.JahiaData" %>
<%@ page import=3D"org.jahia.engines.EngineMessage"%>
<%@ page import=3D"org.jahia.exceptions.JahiaException"%>
<%@ page import=3D"org.jahia.params.ParamBean"%>
+<%@ page import=3D"org.jahia.registries.ServicesRegistry" %>
<%@ page import=3D"org.jahia.resourcebundle.JahiaResourceBundle"%>
+<%@ page import=3D"org.jahia.services.containers.ContentContainer" %>
+<%@ page import=3D"org.jahia.services.fields.URLIntegrityValidForActivatio=
nResults" %>
+<%@ page import=3D"org.jahia.services.fields.WAIValidForActivationResults"=
%>
+<%@ page import=3D"org.jahia.services.sites.JahiaSite" %>
<%@ page import=3D"org.jahia.services.version.ActivationTestResults"%>
<%@ page import=3D"org.jahia.services.version.IsValidForActivationResults"=
%>
<%@ page import=3D"org.jahia.utils.LanguageCodeConverters"%>
<%@ page import=3D"java.io.IOException"%>
<%@ page import=3D"java.text.MessageFormat"%>
<%@ page import=3D"java.util.*"%>
+<%@ page import=3D"org.jahia.content.*" %>
+<%@ page import=3D"org.jahia.services.fields.ContentField" %>
+<%@ page import=3D"org.jahia.services.pages.ContentPage" %>
<%@ page contentType=3D"text/html;charset=3DUTF-8" language=3D"java" %>
=
<%@ taglib uri=3D"JahiaLib" prefix=3D"jahia" %>
=
<%!
public String displayActivationResult(final Object testResultObject,
- final ParamBean jParams,
+ final JahiaData jData,
final String key)
throws IOException, JahiaException, ClassNotFoundException {
final StringBuffer buff =3D new StringBuffer();
- if (testResultObject.getClass() =3D=3D IsValidForActivationResults=
.class) {
- final IsValidForActivationResults ivfar =3D (IsValidForActivat=
ionResults) testResultObject;
+ final Class objectClass =3D testResultObject.getClass();
+ if (objectClass =3D=3D IsValidForActivationResults.class ||
+ objectClass =3D=3D URLIntegrityValidForActivationResults.c=
lass ||
+ objectClass =3D=3D WAIValidForActivationResults.class) {
+ final ParamBean jParams =3D jData.params();
+ final NodeOperationResult ivfar =3D (NodeOperationResult) test=
ResultObject;
final Locale loc =3D LanguageCodeConverters.languageCodeToLoca=
le(ivfar.getLanguageCode());
final EngineMessage message =3D ivfar.getMsg();
final String msg;
@@ -52,14 +63,47 @@
msg =3D ivfar.getComment();
}
=
- final ObjectKey objectKey =3D ObjectKey.getInstance(key);
- final ContentObject object =3D (ContentObject) JahiaObject.get=
Instance(objectKey);
+ final ObjectKey objKey =3D ivfar.getNodeKey();
+ final ContentObject obj =3D (ContentObject) ContentObject.getI=
nstance(objKey);
+
+ if (obj !=3D null /* && obj.checkWriteAccess(jParams.getUser()=
) */) {
+ if (ivfar.getObjectType().equals(ContentFieldKey.FIELD_TYP=
E)) {
+ buff.append("[<b>");
+ buff.append("<a href=3D\"javascript:");
+ buff.append(jData.gui().html().drawUpdateFieldLauncher=
((ContentField) obj));
+ buff.append("\">");
+ buff.append(ivfar.getObjectType()).append(" ").append(=
ivfar.getObjectID());
+ buff.append("</a>");
+ buff.append("</b>] - ");
+
+ } else if (ivfar.getObjectType().equals(ContentContainerKe=
y.CONTAINER_TYPE)) {
+ buff.append("[<b>");
+ buff.append("<a href=3D\"javascript:");
+ buff.append(jData.gui().html().drawUpdateContainerLaun=
cher((ContentContainer) obj));
+ buff.append("\">");
+ buff.append(ivfar.getObjectType()).append(" ").append(=
ivfar.getObjectID());
+ buff.append("</a>");
+ buff.append("</b>] - ");
+
+ } else if (ivfar.getObjectType().equals(ContentPageKey.PAG=
E_TYPE)) {
+ buff.append("[<b>");
+ buff.append("<a href=3D\"javascript:");
+ buff.append(jData.gui().html().drawPagePropertiesLaunc=
her((ContentPage) obj));
+ buff.append("\">");
+ buff.append(ivfar.getObjectType()).append(" ").append(=
ivfar.getObjectID());
+ buff.append("</a>");
+ buff.append("</b>] - ");
+
+ } else {
+ buff.append("[<b>").append(ivfar.getObjectType()).appe=
nd(" ").append(ivfar.getObjectID()).append("</b>] - ");
+ }
+ }
=
- buff.append("[<b>").append(ivfar.getObjectType()+" "+ivfar.get=
ObjectID()).append("</b>] - ");
buff.append(JahiaResourceBundle.getEngineResource("org.jahia.e=
ngines.shared.Page_Field.languages.label",
jParams, jParams.getLocale()));
buff.append(": '<b>").append(loc.getDisplayLanguage(jParams.ge=
tLocale()));
buff.append("</b>': ").append(msg);
+ buff.append(" ");
=
} else {
buff.append(testResultObject.toString());
@@ -71,9 +115,16 @@
<%
final String key =3D request.getParameter("objectkey");
final ActivationTestResults results =3D (ActivationTestResults) reques=
t.getSession().getAttribute(key);
+ final JahiaData jData =3D (JahiaData) request.getAttribute("org.jahia.=
data.JahiaData");
final ParamBean jParams =3D (ParamBean) request.getAttribute("org.jahi=
a.params.ParamBean");
%>
=
+<script type=3D"text/javascript">
+ window.onunload =3D function () {
+ window.opener.refreshTree();
+ }
+</script>
+
<h3 class=3D"wflowreport">
<jahia:engineResourceBundle
resourceName=3D"org.jahia.engines.workflow.WorkflowEngine.work=
flowreport.label"/>
@@ -81,7 +132,7 @@
=
<div id=3D"buttons">
<div class=3D"button">
- <a href=3D"javascript:window.close();"
+ <a href=3D"javascript:window.opener.refreshTree();window.close();"
title=3D"<jahia:engineResourceBundle resourceName=3D"org.jahia.=
close.button"/>">
<jahia:engineResourceBundle resourceName=3D"org.jahia.close.bu=
tton"/>
</a>
@@ -90,6 +141,144 @@
=
<br/> <br/>
=
+<% final JahiaSite site =3D ServicesRegistry.getInstance().getJahiaSitesSe=
rvice().getSite(jParams.getSiteID());
+ if (site.getURLIntegrityCheck() + site.getWAIComplianceCheck() > 0) {
+ final List warnings =3D results.getWarnings();
+ if (warnings.size() > 0) {
+ final Set urlIntegrityWarnings =3D new HashSet();
+ final Set waiIntegrityWarnings =3D new HashSet();
+ final Set otherWarnings =3D new HashSet();
+ for (int i =3D 0; i < warnings.size(); i++) {
+ final Object result =3D warnings.get(i);
+ final Class c =3D result.getClass();
+ if (c =3D=3D WAIValidForActivationResults.class) {
+ waiIntegrityWarnings.add(result);
+ } else if (c =3D=3D URLIntegrityValidForActivationResults.=
class) {
+ urlIntegrityWarnings.add(result);
+ } else {
+ otherWarnings.add(result);
+ }
+ } %>
+
+<% if (waiIntegrityWarnings.size() > 0) { %>
+<h5 class=3D"warningIcon">
+ <span class=3D"errorbold"><jahia:engineResourceBundle
+ resourceName=3D"org.jahia.engines.shared.BigText_Field.WAIwarn=
ing.label"/></span></h5>
+<ul>
+ <%
+ final Iterator iterator =3D waiIntegrityWarnings.iterator();
+ while (iterator.hasNext()) {
+ final Object testResultObject =3D iterator.next();
+
+ %>
+ <li><%=3DdisplayActivationResult(testResultObject, jData, key)%></li>
+ <% } %>
+</ul>
+<% } %>
+
+<% if (urlIntegrityWarnings.size() > 0) { %>
+<h5 class=3D"warningIcon">
+ <span class=3D"errorbold"><jahia:engineResourceBundle
+ resourceName=3D"org.jahia.engines.shared.BigText_Field.warning=
.label"/></span></h5>
+<ul>
+ <%
+ final Iterator iterator =3D urlIntegrityWarnings.iterator();
+ while (iterator.hasNext()) {
+ final Object testResultObject =3D iterator.next();
+
+ %>
+ <li><%=3DdisplayActivationResult(testResultObject, jData, key)%></li>
+
+ <% } %>
+</ul>
+<% } %>
+
+<% if (otherWarnings.size() > 0) { %>
+<h5 class=3D"warningIcon">
+ <span class=3D"errorbold"><jahia:engineResourceBundle resourceName=3D"=
org.jahia.warning.label"/></span></h5>
+<ul>
+ <%
+ final Iterator iterator =3D otherWarnings.iterator();
+ while (iterator.hasNext()) {
+ final Object testResultObject =3D iterator.next();
+
+ %>
+ <li><%=3DdisplayActivationResult(testResultObject, jData, key)%></li>
+ <% } %>
+</ul>
+<% } %>
+<% } %>
+<%
+ final List errors =3D results.getErrors();
+ if (errors.size() > 0) {
+ final Set urlIntegrityErrors =3D new HashSet();
+ final Set waiIntegrityErrors =3D new HashSet();
+ final Set otherErrors =3D new HashSet();
+ for (int i =3D 0; i < errors.size(); i++) {
+ final Object result =3D errors.get(i);
+ final Class c =3D result.getClass();
+ if (c =3D=3D WAIValidForActivationResults.class) {
+ waiIntegrityErrors.add(result);
+ } else if (c =3D=3D URLIntegrityValidForActivationResults.clas=
s) {
+ urlIntegrityErrors.add(result);
+ } else {
+ otherErrors.add(result);
+ }
+ }
+%>
+
+<% if (waiIntegrityErrors.size() > 0) { %>
+<h5 class=3D"errorIcon">
+ <span class=3D"errorbold"><jahia:engineResourceBundle
+ resourceName=3D"org.jahia.engines.shared.BigText_Field.WAIerro=
r.label"/></span></h5>
+<ul>
+ <%
+ final Iterator iterator =3D waiIntegrityErrors.iterator();
+ while (iterator.hasNext()) {
+ final Object testResultObject =3D iterator.next();
+
+ %>
+ <li><%=3DdisplayActivationResult(testResultObject, jData, key)%></li>
+
+ <% } %>
+</ul>
+<% } %>
+
+<% if (urlIntegrityErrors.size() > 0) { %>
+<h5 class=3D"errorIcon">
+ <span class=3D"errorbold"><jahia:engineResourceBundle
+ resourceName=3D"org.jahia.engines.shared.BigText_Field.integri=
tyError.label"/></span></h5>
+<ul>
+ <%
+ final Iterator iterator =3D urlIntegrityErrors.iterator();
+ while (iterator.hasNext()) {
+ final Object testResultObject =3D iterator.next();
+
+ %>
+ <li><%=3DdisplayActivationResult(testResultObject, jData, key)%></li>
+
+ <% } %>
+</ul>
+<% } %>
+
+<% if (otherErrors.size() > 0) { %>
+<h5 class=3D"errorIcon">
+ <span class=3D"errorbold"><jahia:engineResourceBundle resourceName=3D"=
org.jahia.error.label"/></span></h5>
+<ul>
+ <%
+ final Iterator iterator =3D otherErrors.iterator();
+ while (iterator.hasNext()) {
+ final Object testResultObject =3D iterator.next();
+
+ %>
+ <li><%=3DdisplayActivationResult(testResultObject, jData, key)%></li>
+
+ <% } %>
+</ul>
+<% } %>
+<% } %>
+
+<% } else { %>
<% if (results.getWarnings().size() > 0) { %>
<h5 class=3D"warningIcon">
<span class=3D"errorbold"><jahia:engineResourceBundle resourceName=3D"=
org.jahia.warning.label"/></span></h5>
@@ -105,7 +294,7 @@
final Object testResultObject =3D iterator.next();
=
%>
- <li><%=3DdisplayActivationResult(testResultObject, jParams, key)%></li>
+ <li><%=3DdisplayActivationResult(testResultObject, jData, key)%></li>
=
<% } %>
</ul>
@@ -125,10 +314,9 @@
while (iterator.hasNext()) {
final Object testResultObject =3D iterator.next();
%>
- <li><%=3DdisplayActivationResult(testResultObject, jParams, key)%></li>
-
+ <li><%=3DdisplayActivationResult(testResultObject, jData, key)%></li>
<% } %>
</ul>
<% } %>
-
+<% } %>
<br/>
\ No newline at end of file
_______________________________________________
cvs_list mailing list
[email protected]
http://lists.jahia.org/cgi-bin/mailman/listinfo/cvs_list
