Author: tdraier
Date: Tue Aug 28 17:38:27 2007
New Revision: 18283
URL: https://svndev.jahia.net/websvn/listing.php?sc=3D1&rev=3D18283&repname=
=3Djahia
Log:
display logs
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=3D18283&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 Tue Aug 28 17:38:27 2007
@@ -66,7 +66,6 @@
%>
<jesi:control cache=3D"no"/>
<%
- String command =3D request.getParameter("command");//to choose the pro=
cess to display
JahiaUser theUser =3D (JahiaUser) session.getAttribute(ParamBean.SESSI=
ON_USER);
Locale locale =3D (Locale) session.getAttribute(ParamBean.SESSION_LOCA=
LE);
StringBuffer buff =3D new StringBuffer();
@@ -113,8 +112,7 @@
if (dispOK) {
=
TreeOperationResult result =3D (TreeOperationResult) jd.getJob=
DataMap().get("result");
- if(command !=3D null){
- if (command.equals("all") || command.equals("warn")) {
+
if(result.getWarnings().size()>0){
buff.append("<br/><h2>Warnings</h2>");
}
@@ -134,14 +132,12 @@
=
//out.println(count+"-"+thenode.getComment()+" "+theno=
de.getLocalName()+" "+thenode.getQname()+" "+thenode.getImportString());
}
- }
=
- if(command.equals("all") || command.equals("error")){
if(result.getErrors().size()>0){
buff.append("<br/><h2>Errors</h2>");
}
// error messages
- int count =3D 0;
+ count =3D 0;
for (java.util.Iterator iterator =3D result.getErrors().it=
erator(); iterator.hasNext();) {
NodeOperationResult thenode =3D
(NodeOperationResult) iterator.next();
count++;
@@ -155,13 +151,6 @@
}
}
}
- } else {
- dispOK=3Dfalse;
- }
-
- }
-
-
}
=
if (!dispOK) {
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=3D18283&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 Tue Aug 28 17:38:27 2007
@@ -1370,11 +1370,9 @@
=
switch (jobstatus) {
case 0:
- // errors
%>
<img src=3D"<%=3Drequest.getContextPath()%>/jsp/jahia/engines/images/i=
cons/workflow/errors.gif" width=3D"9" height=3D"10"
border=3D"0"> <%=3DgetRessource("org.jahia.engines.processDisplay=
.error.message", locale)%>
- <a href=3D"displaylog.jsp?command=3Derror&jd=3D<%=3Djd.getName()%>"><%=
=3DgetRessource("org.jahia.engines.processDisplay.error.see", locale)%> <%=
=3Dresult.getErrors().size()%> <%=3DgetRessource("org.jahia.engines.process=
Display.error.errors", locale)%></a>
<%
break;
case 1:
@@ -1382,30 +1380,22 @@
<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)%>
<%
- 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
%>
<img src=3D"<%=3Drequest.getContextPath()%>/jsp/jahia/engines/images/i=
cons/workflow/warnings.gif" width=3D"9" height=3D"10"
border=3D"0"> <%=3DgetRessource("org.jahia.engines.processDisplay=
.error.message", locale)%>
<%
- if(result.getWarnings().size()>0){
- %>
- <a href=3D"displaylog.jsp?command=3Dwarn&jd=3D<%=3Djd.getName()%>"><%=
=3DgetRessource("org.jahia.engines.processDisplay.error.see", locale)%> <%=
=3Dresult.getWarnings().size()%> <%=3DgetRessource("org.jahia.engines.proce=
ssDisplay.warning.warnings", locale)%> </a>
- <% }
break;
}
-
-
+ if(result.getErrors().size()>0 || result.getWarnings().size()>0){
+ %>
+ <a href=3D"displaylog.jsp?jd=3D<%=3Djd.getName()%>"><%=3DgetRessource=
("org.jahia.engines.processDisplay.allmessages.message", locale)%></a>
+ <%
+ }
%>
<br>
<br>
-
</td></tr>
<%
}//end of infoasked
_______________________________________________
cvs_list mailing list
[email protected]
http://lists.jahia.org/cgi-bin/mailman/listinfo/cvs_list
