Author: dpillot
Date: Tue Jan 10 17:03:43 2006
New Revision: 12757
URL: https://jahia.mine.nu/websvn/listing.php?sc=1&rev=12757&repname=jahia
Log:
test version
Modified:
trunk/core/src/webapp/jsp/jahia/engines/importexport/processing.jsp
Modified: trunk/core/src/webapp/jsp/jahia/engines/importexport/processing.jsp
URL:
https://jahia.mine.nu/websvn/diff.php?path=/trunk/core/src/webapp/jsp/jahia/engines/importexport/processing.jsp&rev=12757&repname=jahia
==============================================================================
--- trunk/core/src/webapp/jsp/jahia/engines/importexport/processing.jsp
(original)
+++ trunk/core/src/webapp/jsp/jahia/engines/importexport/processing.jsp Tue Jan
10 17:03:43 2006
@@ -241,7 +241,7 @@
updateTime('test',ctime);
- setTimeout("showTime()", 1000);
+ setTimeout("showTime()", 1000);//1 sec
}
function updateTime(id, texte){
@@ -309,8 +309,15 @@
String source = (String)
data.get("source");
String dest = (String)
data.get("dest");
String user = (String)
data.get("userkey");
- Date scheduled=new
Date(data.getLong("scheduled"));
- SimpleDateFormat mysdf = new
SimpleDateFormat("dd/MM/yy kk:mm");
+ Date scheduled;
+ String scheduled_string="NA";
+ if(data.get("scheduled")!= null) {
+ scheduled=new
Date(data.getLong("scheduled"));
+ SimpleDateFormat mysdf = new
SimpleDateFormat("dd/MM/yy kk:mm");
+ scheduled_string=
mysdf.format(scheduled);
+ }
+
+
%>
<tr>
<td><%= type %></td>
@@ -329,7 +336,7 @@
<%}
%></td>
- <td>at <%= mysdf.format(scheduled) %></td>
+ <td> <%=scheduled_string %></td>
</tr>
<%
}
@@ -360,12 +367,3 @@
</table>
</body>
</html>
-<%
-
- /**
- * $Log$
- * Revision 1.1 2005/12/22 16:51:23 dpillot
- * beta version of process window
- *
- */
-%>
\ No newline at end of file
