Author: dpillot
Date: Thu Jun 28 17:03:28 2007
New Revision: 17818
URL: https://svndev.jahia.net/websvn/listing.php?sc=3D1&rev=3D17818&repname=
=3Djahia
Log:
fix for logs access in displayprocess
Modified:
branches/JAHIA-5-0-SP-BRANCH/core/src/webapp/jsp/jahia/processing/displ=
aylog.jsp
branches/JAHIA-5-0-SP-BRANCH/core/src/webapp/jsp/jahia/processing/proce=
ssing.jsp
Modified: branches/JAHIA-5-0-SP-BRANCH/core/src/webapp/jsp/jahia/processing=
/displaylog.jsp
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/branches/JAHIA-5-0-SP=
-BRANCH/core/src/webapp/jsp/jahia/processing/displaylog.jsp&rev=3D17818&rep=
name=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
--- branches/JAHIA-5-0-SP-BRANCH/core/src/webapp/jsp/jahia/processing/displ=
aylog.jsp (original)
+++ branches/JAHIA-5-0-SP-BRANCH/core/src/webapp/jsp/jahia/processing/displ=
aylog.jsp Thu Jun 28 17:03:28 2007
@@ -92,12 +92,14 @@
alls =3D service.getAllJobsDetails();
} catch (JahiaException e) {
logger.debug("error", e);
+ errorMessage =3D "getAllJobsDetails unavailable!";
dispOK =3D false;
}
if (dispOK) {
//looping to get all jobs
JobDetail jd =3D null;
dispOK =3D false;
+ // check for job requested
for (java.util.Iterator iterator =3D alls.iterator(); iterator.has=
Next();) {
jd =3D (JobDetail) iterator.next();
if (jd.getName().equals(request.getParameter("jd"))) {
@@ -105,12 +107,18 @@
break;
}
}
-
+ if (!dispOK) {
+ errorMessage =3D "job not found!";
+ }
if (dispOK) {
=
TreeOperationResult result =3D (TreeOperationResult) jd.getJob=
DataMap().get("result");
- if (command !=3D null && command.equals("warn")) {
- // warn only
+ if(command !=3D null){
+ if (command.equals("all") || command.equals("warn")) {
+ if(result.getWarnings().size()>0){
+ buff.append("<br/><h2>Warnings</h2>");
+ }
+ // warn messages
int count =3D 0;
for (java.util.Iterator iterator =3D result.getWarnings().=
iterator(); iterator.hasNext();) {
NodeOperationResult thenode =3D (NodeOperationResult) =
iterator.next();
@@ -126,8 +134,13 @@
=
//out.println(count+"-"+thenode.getComment()+" "+theno=
de.getLocalName()+" "+thenode.getQname()+" "+thenode.getImportString());
}
- } else if(command !=3D null && command.equals("error")){
- // error only
+ }
+
+ if(command.equals("all") || command.equals("error")){
+ if(result.getErrors().size()>0){
+ buff.append("<br/><h2>Errors</h2>");
+ }
+ // error messages
int count =3D 0;
for (java.util.Iterator iterator =3D result.getErrors().it=
erator(); iterator.hasNext();) {
NodeOperationResult thenode =3D
(NodeOperationResult) iterator.next();
@@ -141,8 +154,9 @@
buff.append("<br/>");
}
}
+ }
} else {
- dispOK=3Dfalse;
+ dispOK=3Dfalse;
}
=
}
Modified: branches/JAHIA-5-0-SP-BRANCH/core/src/webapp/jsp/jahia/processing=
/processing.jsp
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/branches/JAHIA-5-0-SP=
-BRANCH/core/src/webapp/jsp/jahia/processing/processing.jsp&rev=3D17818&rep=
name=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
--- branches/JAHIA-5-0-SP-BRANCH/core/src/webapp/jsp/jahia/processing/proce=
ssing.jsp (original)
+++ branches/JAHIA-5-0-SP-BRANCH/core/src/webapp/jsp/jahia/processing/proce=
ssing.jsp Thu Jun 28 17:03:28 2007
@@ -1358,8 +1358,12 @@
%>
<img src=3D"<%=3Drequest.getContextPath()%>/jsp/jahia/engines/images/i=
cons/workflow/accept.gif" width=3D"9" height=3D"10"
border=3D"0"> <%=3DgetRessource("org.jahia.engines.processDisplay=
.success.message", locale)%>
- <!--a href=3D"displaylog.jsp?command=3Dall&jd=3D<%=3Djd.getName()%>=
">see all logs</a-->
<%
+ if(infos[0].equals("import")){
+ // all is available only for import
+ %>
+ <a href=3D"displaylog.jsp?command=3Dall&jd=3D<%=3Djd.getName()%>"><=
%=3DgetRessource("org.jahia.engines.processDisplay.allmessages.message", lo=
cale)%></a>
+ <% }
break;
case 2:
//warnings
_______________________________________________
cvs_list mailing list
[email protected]
http://lists.jahia.org/cgi-bin/mailman/listinfo/cvs_list
