Author: michiel Date: 2009-06-03 22:04:58 +0200 (Wed, 03 Jun 2009) New Revision: 35658
Modified: mmbase/trunk/applications/cloudcontext/templates/commit_group.jsp mmbase/trunk/applications/cloudcontext/templates/group.div.jsp Log: Modified: mmbase/trunk/applications/cloudcontext/templates/commit_group.jsp =================================================================== --- mmbase/trunk/applications/cloudcontext/templates/commit_group.jsp 2009-06-03 19:56:22 UTC (rev 35657) +++ mmbase/trunk/applications/cloudcontext/templates/commit_group.jsp 2009-06-03 20:04:58 UTC (rev 35658) @@ -1,5 +1,5 @@ <%...@page language="java" contentType="text/html;charset=UTF-8" -%><%@ taglib uri="http://www.mmbase.org/mmbase-taglib-1.0"; prefix="mm" +%><%@ taglib uri="http://www.mmbase.org/mmbase-taglib-2.0"; prefix="mm" %><%...@include file="import.jsp" %><%...@include file="settings.jsp" %> <mm:content language="$language" expires="0"> @@ -21,50 +21,7 @@ <mm:fieldinfo type="useinput" /> </mm:fieldlist> - <mm:import externid="_parentgroups" vartype="list" jspvar="parentgroups" /> - <mm:import externid="_childgroups" vartype="list" jspvar="childgroups" /> - <mm:listrelations type="mmbasegroups" role="contains" searchdir="source"> - <mm:relatednode id="oldparentgroup" jspvar="oldparentgroup"> - <% if (! parentgroups.contains("" + oldparentgroup.getNumber())) { %> - <mm:import id="deleteparent" /> - <% } %> - </mm:relatednode> - <mm:present referid="deleteparent"> - <mm:deletenode /> - </mm:present> - </mm:listrelations> - - <mm:unrelatednodes id="unrelated" type="mmbasegroups" /> - - <mm:write referid="unrelated" jspvar="unrelated" vartype="list"> - <mm:stringlist referid="_parentgroups"> - <mm:node id="newparentgroup" number="$_" jspvar="newparentgroup"> - <% if (unrelated.contains(newparentgroup)) { %> - <mm:createrelation source="newparentgroup" destination="group" role="contains" /> - <% } %> - </mm:node> - </mm:stringlist> - </mm:write> - <mm:listrelations type="mmbasegroups" role="contains" searchdir="destination"> - <mm:relatednode id="childgroup" jspvar="childgroup"> - <% if (! childgroups.contains("" + childgroup.getNumber())) { %> - <mm:import id="deletechild" /> - <% } %> - </mm:relatednode> - <mm:present referid="deletechild"> - <mm:deletenode /> - </mm:present> - </mm:listrelations> - <mm:write referid="unrelated" jspvar="unrelated" vartype="list"> - <mm:stringlist referid="_childgroups"> - <mm:node id="newchildgroup" number="$_" jspvar="newchildgroup"> - <% if (unrelated.contains(newchildgroup)) { %> - <mm:createrelation source="group" destination="newchildgroup" role="contains" /> - <% } %> - </mm:node> - </mm:stringlist> - </mm:write> <mm:present referid="wasnew"> <mm:import externid="createcontext" /> <mm:present referid="createcontext"> @@ -117,4 +74,4 @@ </mm:node> </mm:cloud> -</mm:content> \ No newline at end of file +</mm:content> Modified: mmbase/trunk/applications/cloudcontext/templates/group.div.jsp =================================================================== --- mmbase/trunk/applications/cloudcontext/templates/group.div.jsp 2009-06-03 19:56:22 UTC (rev 35657) +++ mmbase/trunk/applications/cloudcontext/templates/group.div.jsp 2009-06-03 20:04:58 UTC (rev 35658) @@ -1,3 +1,4 @@ +<%org.mmbase.security.implementation.cloudcontext.Caches.waitForCacheInvalidation(); %> <div class="group"> <div class="environment"> <p class="current"> @@ -16,6 +17,9 @@ <div class="rights"> <form method="post" action="<mm:url referids="parameters,$parameters"><mm:param name="url">commit_group.jsp</mm:param></mm:url>"> + + + <input type="hidden" name="group" value="<mm:field name="number" />" /> <table> <mm:fieldlist type="edit" fields="owner"> @@ -25,8 +29,7 @@ <mm:maywrite inverse="true"> <tr><td><mm:fieldinfo type="guiname" /></td><td colspan="3"><mm:fieldinfo type="value" /></td></tr> </mm:maywrite> - </mm:fieldlist> - + </mm:fieldlist> </table> <mm:import id="back">index_groups.jsp</mm:import> <%...@include file="groupOrUserRights.table.jsp" %> _______________________________________________ Cvs mailing list [email protected] http://lists.mmbase.org/mailman/listinfo/cvs
