Update of /var/cvs/applications/cloudcontext/META-INF/tags/mm/security
In directory james.mmbase.org:/tmp/cvs-serv23109/META-INF/tags/mm/security

Modified Files:
        commit.tagx table.tagx 
Log Message:
MMB-1757


See also: 
http://cvs.mmbase.org/viewcvs/applications/cloudcontext/META-INF/tags/mm/security
See also: http://www.mmbase.org/jira/browse/MMB-1757


Index: commit.tagx
===================================================================
RCS file: 
/var/cvs/applications/cloudcontext/META-INF/tags/mm/security/commit.tagx,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- commit.tagx 30 Dec 2008 17:49:43 -0000      1.1
+++ commit.tagx 5 Jan 2009 12:09:24 -0000       1.2
@@ -4,13 +4,14 @@
     xmlns:jsp="http://java.sun.com/JSP/Page";
     version="2.0">
   <jsp:directive.attribute name="operations"  />
-  <jsp:directive.attribute name="type"  />
+  <jsp:directive.attribute name="query"  
type="org.mmbase.storage.search.SearchQuery" />
 
   <mm:import id="ops" vartype="list">${empty operations ? 
'create,read,write,delete,change context,change relation' : 
operations}</mm:import>
 
   <mm:functioncontainer>
     <mm:param name="grouporuser"><mm:field name="number" /></mm:param>
-    <mm:listnodes id="thiscontext" type="${empty type ? 'mmbasecontext' : 
type}">
+    <mm:listnodescontainer referid="query" type="${empty query ? 
'mmbasecontexts' : ''}">
+      <mm:listnodes id="thiscontext">
       <mm:stringlist referid="ops">
         <mm:param name="operation"><mm:write /></mm:param>
         <mm:import id="right" externid="$_:$thiscontext" />
@@ -22,6 +23,7 @@
         </mm:compare>
       </mm:stringlist>
     </mm:listnodes>
+    </mm:listnodescontainer>
   </mm:functioncontainer>
 
 </jsp:root>


Index: table.tagx
===================================================================
RCS file: 
/var/cvs/applications/cloudcontext/META-INF/tags/mm/security/table.tagx,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- table.tagx  30 Dec 2008 17:49:43 -0000      1.2
+++ table.tagx  5 Jan 2009 12:09:24 -0000       1.3
@@ -1,63 +1,14 @@
 <jsp:root
     xmlns:c="http://java.sun.com/jsp/jstl/core";
     xmlns:mm="http://www.mmbase.org/mmbase-taglib-2.0";
+    xmlns:sec="http://www.mmbase.org/tags/mm/security";
     xmlns:jsp="http://java.sun.com/JSP/Page";
     version="2.0">
   <jsp:directive.attribute name="operations"  />
   <jsp:directive.attribute name="query"  
type="org.mmbase.storage.search.SearchQuery" />
   <jsp:directive.attribute name="page"  />
 
-  <mm:import id="ops" vartype="list">${empty operations ? 
'create,read,write,delete,change context,change relation' : 
operations}</mm:import>
-
   <table class="rights">
-    <tr>
-      <th><mm:nodeinfo nodetype="${empty query ? 'mmbasecontexts' : 
query.builder.tableName}" type="guinodemanager" /></th>
-      <mm:stringlist referid="ops">
-        <th><mm:write /></th>
-      </mm:stringlist>
-    </tr>
-    <mm:functioncontainer referids="_n...@grouporuser">
-      <mm:listnodescontainer referid="query" type="${empty query ? 
'mmbasecontexts' : ''}">
-        <mm:listnodes id="thiscontext"
-                      max="200"
-                      >
-          <tr>
-          <td class="text">
-            <mm:import id="text">
-              <mm:nodeinfo type="gui" />
-              <mm:hasfield name="description"><mm:field 
name="description"><mm:isnotempty>(<mm:write 
/>)</mm:isnotempty></mm:field></mm:hasfield>
-            </mm:import>
-            <c:choose>
-              <c:when test="${empty page}">
-                <mm:write referid="text" escape="none" />
-              </c:when>
-              <c:otherwise>
-                <mm:link page="${page}" referids="thiscont...@context">
-                  <a href="${_}">
-                    <mm:write referid="text" escape="none" />
-                  </a>
-                </mm:link>
-              </c:otherwise>
-            </c:choose>
-          </td>
-          <mm:stringlist referid="ops">
-            <mm:param name="operation"><mm:write /></mm:param>
-            <mm:function name="parentsallow" id="pa" write="false" />
-            <mm:function name="allows" id="a" write="false" />
-            <td class="${pa ? 'parent' : ''}">
-              <mm:booleanfunction name="maygrant">
-                <mm:radio type="checkbox" name="${_}:${_node}" value="on" 
compare="${a ? 'on' : 'off'}" />
-              </mm:booleanfunction>
-              <mm:booleanfunction name="maygrant" inverse="true">
-                <mm:booleanfunction name="allows">
-                  <jsp:text>X</jsp:text>
-                </mm:booleanfunction>
-              </mm:booleanfunction>
-            </td>
-          </mm:stringlist>
-        </tr>
-      </mm:listnodes>
-      </mm:listnodescontainer>
-    </mm:functioncontainer>
+    <sec:tbody operations="${operations}" query="${query}" page="${page}" />
   </table>
 </jsp:root>
_______________________________________________
Cvs mailing list
[email protected]
http://lists.mmbase.org/mailman/listinfo/cvs

Reply via email to