Author: michiel
Date: 2009-05-19 19:52:00 +0200 (Tue, 19 May 2009)
New Revision: 35311
Modified:
mmbase/trunk/applications/cloudcontext/META-INF/tags/mm/security/tbody.tagx
mmbase/trunk/applications/cloudcontext/blocks/group.jspx
mmbase/trunk/applications/cloudcontext/blocks/user.jspx
Log:
Fixing the security-editor blocks
Modified:
mmbase/trunk/applications/cloudcontext/META-INF/tags/mm/security/tbody.tagx
===================================================================
--- mmbase/trunk/applications/cloudcontext/META-INF/tags/mm/security/tbody.tagx
2009-05-19 17:12:10 UTC (rev 35310)
+++ mmbase/trunk/applications/cloudcontext/META-INF/tags/mm/security/tbody.tagx
2009-05-19 17:52:00 UTC (rev 35311)
@@ -5,6 +5,7 @@
version="2.0">
<jsp:directive.attribute name="operations" />
<jsp:directive.attribute name="query"
type="org.mmbase.storage.search.SearchQuery" />
+ <jsp:directive.attribute name="submit" type="java.lang.Boolean" />
<mm:import id="ops" vartype="list">${empty operations ?
'create,read,write,delete,change context,change relation' :
operations}</mm:import>
@@ -36,9 +37,18 @@
<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">
+ <c:choose>
+ <c:when test="${submit}">
+ <mm:import id="as" externid="${_}:${_node}" />
+ <mm:import id="a">${! empty as}</mm:import>
+ </c:when>
+ <c:otherwise>
+ <mm:function name="allows" id="a" write="false" />
+ </c:otherwise>
+ </c:choose>
<mm:radio type="checkbox" name="${_}:${_node}" value="on"
compare="${a ? 'on' : 'off'}" />
</mm:booleanfunction>
<mm:booleanfunction name="maygrant" inverse="true">
Modified: mmbase/trunk/applications/cloudcontext/blocks/group.jspx
===================================================================
--- mmbase/trunk/applications/cloudcontext/blocks/group.jspx 2009-05-19
17:12:10 UTC (rev 35310)
+++ mmbase/trunk/applications/cloudcontext/blocks/group.jspx 2009-05-19
17:52:00 UTC (rev 35311)
@@ -31,20 +31,21 @@
</mm:function>
<mm:import externid="submit" />
- <mm:present referid="submit">
- <mm:valid>
- <c:forEach items="${queries}" var="query">
- <sec:commit query="${query}"/>
- </c:forEach>
- <mm:commit />
- </mm:valid>
- </mm:present>
<c:forEach items="${queries}" var="query">
- <sec:tbody query="${query}" />
+ <sec:tbody query="${query}" submit="${! empty submit}" />
</c:forEach>
</table>
<input type="submit" name="submit" />
+
+ <mm:present referid="submit">
+ <mm:valid>
+ <c:forEach items="${queries}" var="query">
+ <sec:commit query="${query}"/>
+ </c:forEach>
+ <mm:commit />
+ </mm:valid>
+ </mm:present>
</mm:node>
</mm:form>
</div>
Modified: mmbase/trunk/applications/cloudcontext/blocks/user.jspx
===================================================================
--- mmbase/trunk/applications/cloudcontext/blocks/user.jspx 2009-05-19
17:12:10 UTC (rev 35310)
+++ mmbase/trunk/applications/cloudcontext/blocks/user.jspx 2009-05-19
17:52:00 UTC (rev 35311)
@@ -6,7 +6,11 @@
xmlns:sec="http://www.mmbase.org/tags/mm/security";
class="mm_c c_cloudcontent b_user ${requestScope.className}"
id="${requestScope.componentId}">
+ <!--
+ xmlns:sec="urn:jsptagdir:/WEB-INF/tags/mm/security"
+ -->
+
<jsp:output omit-xml-declaration="true" />
<mm:import externid="node" required="true" />
@@ -20,6 +24,7 @@
validator.setup("#user_form");
});
</script>
+ <mm:log> HOOOI </mm:log>
<mm:form id="user_form">
<mm:node referid="node">
@@ -37,24 +42,29 @@
</tr>
</mm:fieldlist>
</table>
+ <mm:function set="cloudcontext" name="authorization"
write="false"><c:set var="queries" value="${_.contextProvider.contextQueries}"
/></mm:function>
- <mm:function set="cloudcontext" name="authorization"
write="false"><c:set var="queries" value="${_.contextProvider.contextQueries}"
/></mm:function>
<mm:import externid="submit" />
+
+ <table class="rights">
+ <c:forEach items="${queries}" var="query">
+ <sec:tbody query="${query}" submit="${! empty submit}"/>
+ </c:forEach>
+ </table>
+ <input type="submit" value="submit" name="submit" />
+
+
+
<mm:present referid="submit">
<mm:valid>
- <mm:commit />
<c:forEach items="${queries}" var="query">
+ <mm:log>Commiting for ${query}</mm:log>
<sec:commit query="${query}"/>
</c:forEach>
+ <mm:commit />
<p>Committed</p>
</mm:valid>
</mm:present>
- <table class="rights">
- <c:forEach items="${queries}" var="query">
- <sec:tbody query="${query}" />
- </c:forEach>
- </table>
- <input type="submit" value="submit" name="submit" />
</mm:node>
</mm:form>
</div>
_______________________________________________
Cvs mailing list
[email protected]
http://lists.mmbase.org/mailman/listinfo/cvs
