Author: michiel
Date: 2009-06-03 21:56:22 +0200 (Wed, 03 Jun 2009)
New Revision: 35657
Modified:
mmbase/trunk/applications/cloudcontext/templates/commit_user.jsp
mmbase/trunk/applications/cloudcontext/templates/create_user.jsp
mmbase/trunk/applications/cloudcontext/templates/delete_user.jsp
Log:
some fixes
Modified: mmbase/trunk/applications/cloudcontext/templates/commit_user.jsp
===================================================================
--- mmbase/trunk/applications/cloudcontext/templates/commit_user.jsp
2009-06-03 19:46:29 UTC (rev 35656)
+++ mmbase/trunk/applications/cloudcontext/templates/commit_user.jsp
2009-06-03 19:56:22 UTC (rev 35657)
@@ -9,7 +9,7 @@
<mm:compare referid="user" value="new">
<mm:remove referid="user" />
<mm:import id="wasnew" />
- <mm:createnode id="user" type="mmbaseusers" />
+ <mm:createnode id="user" type="mmbaseusers" commitonclose="false" />
</mm:compare>
<mm:import id="current">users</mm:import>
@@ -35,46 +35,6 @@
<mm:context>
<mm:cloudinfo type="user" write="false" id="clouduser" />
- <mm:field name="username">
- <mm:compare referid2="clouduser" inverse="true">
- <mm:import externid="_groups" vartype="list" jspvar="groups" />
- <mm:listrelations type="mmbasegroups" role="contains">
- <mm:relatednode jspvar="group">
- <% if (! groups.contains("" + group.getNumber())) { %>
- <mm:import id="delete" />
- <% } %>
- </mm:relatednode>
- <mm:present referid="delete">
- <mm:deletenode />
- </mm:present>
- </mm:listrelations>
- <mm:unrelatednodes id="unrelated" type="mmbasegroups" />
- <mm:write referid="unrelated" jspvar="unrelated" vartype="list">
- <mm:stringlist referid="_groups">
- <mm:node id="ugroup" number="$_" jspvar="ugroup">
- <% if (unrelated.contains(ugroup)) { %>
- <mm:createrelation source="ugroup" destination="user"
role="contains" />
- <% } %>
- </mm:node>
- </mm:stringlist>
- </mm:write>
- <mm:import externid="_rank" />
- <mm:isnotempty referid="_rank">
- <mm:relatednodescontainer type="mmbaseranks" role="rank">
- <mm:constraint field="number" value="$_rank" />
- <mm:size>
- <mm:compare value="0">
- <mm:listrelations type="mmbaseranks" role="rank">
- <mm:deletenode />
- </mm:listrelations>
- <mm:node id="ranknode" number="$_rank" />
- <mm:createrelation source="user" destination="ranknode"
role="rank" />
- </mm:compare>
- </mm:size>
- </mm:relatednodescontainer>
- </mm:isnotempty>
- </mm:compare>
- </mm:field>
<%...@include file="commitGroupOrUserRights.jsp" %>
</mm:context>
Modified: mmbase/trunk/applications/cloudcontext/templates/create_user.jsp
===================================================================
--- mmbase/trunk/applications/cloudcontext/templates/create_user.jsp
2009-06-03 19:46:29 UTC (rev 35656)
+++ mmbase/trunk/applications/cloudcontext/templates/create_user.jsp
2009-06-03 19:56:22 UTC (rev 35657)
@@ -14,37 +14,11 @@
<mm:fieldlist type="edit" nodetype="mmbaseusers">
<tr><td><mm:fieldinfo type="guiname" /></td><td><mm:fieldinfo
type="input" /></td></tr>
</mm:fieldlist>
-
- <tr>
- <td><%=getPrompt(m, "groups")%></td>
- <td>
- <select name="_groups" size="4" multiple="multiple">
- <%-- if a group with alias 'mayreadallgroup" exists, this group is
automiticly including this --%>
- <mm:node number="mayreadallgroup" notfound="skip">
- <mm:field id="mayall" name="number" />
- </mm:node>
-
- <mm:listnodes type="mmbasegroups" orderby="name">
- <option value="<mm:field name="number" />" <mm:present
referid="mayall"><mm:field name="number"><mm:compare
referid2="mayall">selected="selected" </mm:compare></mm:field></mm:present>
><mm:nodeinfo type="gui" /></option>
- </mm:listnodes>
- </select>
- </td>
- </tr>
- <tr>
- <td><%=getPrompt(m, "rang")%></td>
- <td>
- <select name="_rank" size="4">
- <mm:listnodes type="mmbaseranks" orderby="name">
- <option value="<mm:field name="number" />" <mm:field
name="name"><mm:compare value="basic
user">selected="selected"</mm:compare></mm:field>><mm:nodeinfo type="gui"
/></option>
- </mm:listnodes>
- </select>
- </td>
- </tr>
<tr><td><input type="submit" name="submit" value="<%=getPrompt(m,
"submit")%>" /></td></tr>
<input type="hidden" name="user" value="new" />
</table>
- </form>
- </mm:cloud>
- <a href="<mm:url referids="parameters,$parameters" page="." ><mm:param
name="url">index_users.jsp</mm:param></mm:url>"><%=getPrompt(m, "back")%></a>
+ </form>
+</mm:cloud>
+<a href="<mm:url referids="parameters,$parameters" page="." ><mm:param
name="url">index_users.jsp</mm:param></mm:url>"><%=getPrompt(m, "back")%></a>
Modified: mmbase/trunk/applications/cloudcontext/templates/delete_user.jsp
===================================================================
--- mmbase/trunk/applications/cloudcontext/templates/delete_user.jsp
2009-06-03 19:46:29 UTC (rev 35656)
+++ mmbase/trunk/applications/cloudcontext/templates/delete_user.jsp
2009-06-03 19:56:22 UTC (rev 35657)
@@ -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">
<mm:cloud loginpage="login.jsp" rank="$rank">
@@ -13,7 +13,7 @@
<%= getPrompt(m, "deleteduser")%> <mm:field name="gui()" />
<mm:deletenode deleterelations="true" />
</mm:node>
-
+
<hr />
</mm:context>
_______________________________________________
Cvs mailing list
[email protected]
http://lists.mmbase.org/mailman/listinfo/cvs
