Update of 
/var/cvs/contributions/CMSContainer_Modules/tasks/src/webapp/editors/taskmanagement
In directory james.mmbase.org:/tmp/cvs-serv11375

Modified Files:
        tasklist.jsp 
Log Message:
CMSC-933 make the task show once with option all tasks


See also: 
http://cvs.mmbase.org/viewcvs/contributions/CMSContainer_Modules/tasks/src/webapp/editors/taskmanagement
See also: http://www.mmbase.org/jira/browse/CMSC-933


Index: tasklist.jsp
===================================================================
RCS file: 
/var/cvs/contributions/CMSContainer_Modules/tasks/src/webapp/editors/taskmanagement/tasklist.jsp,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -b -r1.5 -r1.6
--- tasklist.jsp        8 Sep 2008 07:56:53 -0000       1.5
+++ tasklist.jsp        9 Oct 2008 09:33:40 -0000       1.6
@@ -70,9 +70,11 @@
                         </tr>
                      </thead>
                      <tbody class="hover">
+                        <c:set var="taskList" value="" /><c:set 
var="isSwapClass" value="true"/>
                         <mm:relatednodes comparator="StatusComparator">
-                           <c:set var="taskid"><mm:field 
name="number"/></c:set>
-                           <tr <mm:even inverse="true">class="swap"</mm:even>>
+                           <c:set var="taskId"><mm:field 
name="number"/></c:set>
+                           <c:if test="${not fn:contains(taskList, taskId)}">
+                           <tr <c:if test="${isSwapClass}">class="swap"</c:if>>
                              <td><mm:field name="creationdate" 
id="created"><mm:time time="${created}" format="d/M/yyyy HH:mm" 
/></mm:field></td>
                              <td><mm:field name="deadline" id="deadl"><mm:time 
time="${deadl}" format="d/M/yyyy HH:mm"/></mm:field></td>
                                 <td><mm:field name="title"/></td>
@@ -89,7 +91,8 @@
                              </mm:relatednodescontainer>
                              <c:set var="status"><mm:field name="status" 
/></c:set>
                              <td><fmt:message key="${status}" /></td>
-                             <td><c:choose>
+                              <td>
+                                 <c:choose>
                                <c:when test="${empty elementnumber}">
                                        <fmt:message key="task.noelement"/>
                                  </c:when>
@@ -102,7 +105,8 @@
                                                                         
</mm:url>" target="rightpane"><img src="../gfx/icons/edit.png" align="top" 
alt="<fmt:message key="task.editelement"/>" title="<fmt:message 
key="task.editelement"/>"/></a> ${elementtitel}
                                                                 </mm:hasrank>
                                  </c:otherwise>
-                             </c:choose></td>
+                                 </c:choose>
+                              </td>
                              <td>${elementtype}</td>
                              <td>
                              <mm:hasrank minvalue="basic user">
@@ -116,6 +120,12 @@
                                                         </mm:hasrank>
                              </td>
                           </tr>
+                           <c:set var="taskList">${taskList},${taskId}</c:set>
+                           <c:choose>
+                              <c:when test="${isSwapClass eq 'false'}"><c:set 
var="isSwapClass" value="true"/></c:when>
+                              <c:when test="${isSwapClass eq 'true'}"><c:set 
var="isSwapClass" value="false"/></c:when>
+                           </c:choose>
+                           </c:if>
                         </mm:relatednodes>
                      </tbody>
                   </table>
_______________________________________________
Cvs mailing list
[email protected]
http://lists.mmbase.org/mailman/listinfo/cvs

Reply via email to