Update of
/var/cvs/contributions/CMSContainer_Modules/publish-remote/src/webapp/editors/admindashboard/publish
In directory
james.mmbase.org:/tmp/cvs-serv21471/publish-remote/src/webapp/editors/admindashboard/publish
Modified Files:
viewqueue.jsp
Log Message:
CMSC-654 deleted nodes crash admin pq page
Skip nodes which are deleted
See also:
http://cvs.mmbase.org/viewcvs/contributions/CMSContainer_Modules/publish-remote/src/webapp/editors/admindashboard/publish
See also: http://www.mmbase.org/jira/browse/CMSC-654
Index: viewqueue.jsp
===================================================================
RCS file:
/var/cvs/contributions/CMSContainer_Modules/publish-remote/src/webapp/editors/admindashboard/publish/viewqueue.jsp,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -b -r1.5 -r1.6
--- viewqueue.jsp 15 Aug 2007 12:17:15 -0000 1.5
+++ viewqueue.jsp 1 Feb 2008 14:08:50 -0000 1.6
@@ -41,11 +41,14 @@
<mm:field name="action" id="action"
write="false"/>
<mm:field name="timestamp"
write="false"><mm:time id="timestamp" write="false" format="dd/MM/yyyy
hh:mm"/></mm:field>
<mm:field name="sourcenumber"
id="number" write="false"/>
+ <mm:field name="publishdate"><mm:time
id="publishdate" write="false" format="dd/MM/yyyy hh:mm"/></mm:field>
+
<c:set var="type" value=""/>
<c:set var="name" value=""/>
- <c:set var="autor" value=""/>
- <c:set var="publishdate" value=""/>
- <mm:node number="${number}">
+ <c:set var="author" value=""/>
+ <c:set var="nodetype" value=""/>
+
+ <mm:node number="${number}"
notfound="skip">
<mm:nodeinfo type="guitype"
jspvar="nodetype" write="false" vartype="String"/>
<mm:hasfield
name="lastmodifier">
<mm:field
name="lastmodifier" id="author" write="false"/>
@@ -64,17 +67,8 @@
<mm:field
name="key" id="name" write="false"/>
</mm:hasfield>
</c:if>
-
- <mm:remove
referid="publishdate"/>
- <mm:hasfield name="publishdate">
- <mm:field
name="publishdate" id="publishdate" write="false"/>
- <mm:isnotempty
referid="publishdate">
- <c:set
var="publishdate"><mm:write referid="publishdate"><mm:time format="dd/MM/yyyy
hh:mm"/></mm:write></c:set>
- </mm:isnotempty>
- </mm:hasfield>
</mm:node>
-
<tr <mm:even
inverse="true">class="swap"</mm:even>>
<td>${number}</td>
<td><fmt:message
key="publish.action.${action}" /></td>
@@ -84,7 +78,6 @@
<td>${name}</td>
<td>${publishdate}</td>
</tr>
-
</mm:listnodes>
</table>
@@ -94,7 +87,6 @@
</div>
</div>
-
</mm:hasrank>
</mm:cloud>
</body>
_______________________________________________
Cvs mailing list
[email protected]
http://lists.mmbase.org/mailman/listinfo/cvs
