Author: mfang
Date: 2009-05-20 09:03:20 +0200 (Wed, 20 May 2009)
New Revision: 35314
Modified:
CMSContainer/trunk/CMSContainer_Modules/workflow/src/webapp/editors/workflow/workflow.js
CMSContainer/trunk/CMSContainer_Modules/workflow/src/webapp/editors/workflow/workflow.jsp
Log:
CMSC-198 Offering solutions when an item can not be published
Modified:
CMSContainer/trunk/CMSContainer_Modules/workflow/src/webapp/editors/workflow/workflow.js
===================================================================
---
CMSContainer/trunk/CMSContainer_Modules/workflow/src/webapp/editors/workflow/workflow.js
2009-05-20 06:02:08 UTC (rev 35313)
+++
CMSContainer/trunk/CMSContainer_Modules/workflow/src/webapp/editors/workflow/workflow.js
2009-05-20 07:03:20 UTC (rev 35314)
@@ -1,8 +1,8 @@
function editRemark(id, oldRemark) {
var remark = prompt("Opmerking ?",oldRemark);
if(remark != null) {
- var form = document.forms[0];
- checkAllBoolean(false, '');
+ var form = document.forms['workflowForm'];
+ checkAllBoolean(false, 'workflowForm', '');
form["check_"+id].checked = true;
form["remark"].value = remark;
form["actionvalue"].value = 'rename';
@@ -11,30 +11,30 @@
}
function selectTab(val, workflowNodetype, orderby, laststatus) {
- document.forms[0].orderby.value = orderby;
- document.forms[0].workflowNodetype.value = workflowNodetype;
- document.forms[0].status.value = val;
+ document.forms['workflowForm'].orderby.value = orderby;
+ document.forms['workflowForm'].workflowNodetype.value = workflowNodetype;
+ document.forms['workflowForm'].status.value = val;
if(laststatus==null ||laststatus=="")
- document.forms[0].laststatus.vlaue="true";
+ document.forms['workflowForm'].laststatus.vlaue="true";
else
- document.forms[0].laststatus.value=laststatus;
- document.forms[0].submit();
+ document.forms['workflowForm'].laststatus.value=laststatus;
+ document.forms['workflowForm'].submit();
}
function returnOrderBy() {
- return document.forms[0].orderby.value;
+ return document.forms['workflowForm'].orderby.value;
}
var isAction = false;
-function checkAllElement(element, type) {
+function checkAllElement(element, formName, type) {
var what = element.checked;
- checkAllBoolean(what, type);
+ checkAllBoolean(what, formName, type);
}
-function checkAllBoolean(what, type) {
+function checkAllBoolean(what, formName, type) {
var namesub = 6 + type.length;
- var el=document.forms[0].elements;
+ var el=document.forms[formName].elements;
for (i=0; i<el.length; i++) {
var e = el[i];
if (e.name.substr(0,namesub)=="check_" + type) {
@@ -52,9 +52,9 @@
function setActionValue(value, status, remark) {
if (submitValid(true)) {
- document.forms[0].actionvalue.value=value;
+ document.forms['workflowForm'].actionvalue.value=value;
if(status) {
- document.forms[0].status.value=status;
+ document.forms['workflowForm'].status.value=status;
}
if (value == 'reject') {
var comment = prompt(remark,"");
@@ -71,9 +71,9 @@
return true;
}
-function submitValid(silent) {
+function submitValid(form, silent) {
if (isAction || silent) {
- var el=document.forms[0].elements;
+ var el=form.elements;
for (i=0; i < el.length; i++) {
var e=el[i];
if (e.name.substr(0,6) == "check_") {
Modified:
CMSContainer/trunk/CMSContainer_Modules/workflow/src/webapp/editors/workflow/workflow.jsp
===================================================================
---
CMSContainer/trunk/CMSContainer_Modules/workflow/src/webapp/editors/workflow/workflow.jsp
2009-05-20 06:02:08 UTC (rev 35313)
+++
CMSContainer/trunk/CMSContainer_Modules/workflow/src/webapp/editors/workflow/workflow.jsp
2009-05-20 07:03:20 UTC (rev 35314)
@@ -298,36 +298,16 @@
</div>
<div class="body">
<p><fmt:message key="workflow.publish.failed" /></p>
- <table>
- <thead>
- <tr>
- <th><fmt:message
key="workflow.content.type" /></th>
- <th><fmt:message
key="workflow.title" /></th>
- <th><fmt:message
key="workflow.lastmodifier" /></th>
- <th><fmt:message
key="workflow.lastmodifieddate" /></th>
- </tr>
- </thead>
- <tbody>
- <mm:listnodes referid="errors">
- <tr>
- <td><mm:nodeinfo
type="guitype" /></td>
- <td><mm:hasfield
name="title">
- <mm:field
name="title" />
- </mm:hasfield>
<mm:hasfield name="name">
- <mm:field
name="name" />
- </mm:hasfield></td>
- <td><mm:hasfield
name="lastmodifier">
- <mm:field
name="lastmodifier" />
- </mm:hasfield></td>
- <td><mm:hasfield
name="lastmodifieddate">
- <mm:field
name="lastmodifieddate">
-
<cmsc:dateformat displaytime="true" />
- </mm:field>
- </mm:hasfield></td>
- </tr>
- </mm:listnodes>
- </tbody>
- </table>
+ <form name="errorWorkflowForm" action='?' method="post"
onsubmit="return submitValid(this, false);">
+ <input type="hidden" name="status" value="${status}" />
+ <input type="hidden" name="workflowNodetype"
value="${workflowNodetype}"/>
+ <c:if test="${fn:length(errors) > 0}">
+ <%@ include file="error_workflow_list_table_fragment.jsp"%>
+ </c:if>
+ <input type="checkbox" name="checkAll"
onclick="checkAllElement(this, 'errorWorkflowForm', '')" /> <fmt:message
key="workflow.select_all" />
+ <input type="hidden" name="actionvalue" value="publish" /><br />
+ <input type="submit" name="action" value="<fmt:message
key="workflow.action.publish" />" style="background-color: #cc0000
!important;"/>
+ </form>
</div>
<div class="bottom">
<div></div>
@@ -353,13 +333,12 @@
key="workflow.wait" /></div>
<div class="body" id="workflow-canvas"><c:set var="orderby"
value="${param.orderby}" />
- <form action='?' method="post" onsubmit="return
submitValid(false);">
+ <form name="workflowForm" action='?' method="post"
onsubmit="return submitValid(this, false);">
<input type="hidden" name="orderby" value="${orderby}" />
<input type="hidden" name="status" value="${status}" />
<input type="hidden" name="laststatus" />
<input type="hidden" name="workflowNodetype"
value="${workflowNodetype}"/>
<c:set var="lastvalue" value='<%=request.getAttribute("laststatus")%>' />
- <c:set var="resultsPerPage" value="50" />
<c:set var="offset" value="${param.offset}" />
<c:set var="listSize">${fn:length(nodeList)}</c:set>
@@ -370,7 +349,7 @@
</c:if> <c:set var="remark">
<fmt:message key="workflow.action.reject.remark" />
</c:set> <input type="checkbox"
name="checkAll"
- onclick="checkAllElement(this, '')" /> <fmt:message
+ onclick="checkAllElement(this, 'workflowForm', '')" />
<fmt:message
key="workflow.select_all" /> <input type="hidden"
name="actionvalue"
value="" /> <input type='hidden' id="remark"
name="remark"
value="[unchanged-item]" /> <br />
_______________________________________________
Cvs mailing list
[email protected]
http://lists.mmbase.org/mailman/listinfo/cvs
