r967 - in xwiki/trunk/src/main: java/com/xpn/xwiki/objects/classes java/com/xpn/xwiki/objects/meta java/com/xpn/xwiki/user/impl/LDAP java/com/xpn/xwiki/user/impl/exo java/com/xpn/xwiki/user/impl/xwiki web/templates
Phung Hai Nam
namphunghai at users.forge.objectweb.org
Wed Mar 8 09:36:17 CET 2006
Author: namphunghai
Date: 2006-03-08 09:36:16 +0100 (Wed, 08 Mar 2006)
New Revision: 967
Modified:
xwiki/trunk/src/main/java/com/xpn/xwiki/objects/classes/GroupsClass.java
xwiki/trunk/src/main/java/com/xpn/xwiki/objects/classes/LevelsClass.java
xwiki/trunk/src/main/java/com/xpn/xwiki/objects/classes/ListClass.java
xwiki/trunk/src/main/java/com/xpn/xwiki/objects/classes/UsersClass.java
xwiki/trunk/src/main/java/com/xpn/xwiki/objects/meta/GroupsMetaClass.java
xwiki/trunk/src/main/java/com/xpn/xwiki/objects/meta/LevelsMetaClass.java
xwiki/trunk/src/main/java/com/xpn/xwiki/objects/meta/ListMetaClass.java
xwiki/trunk/src/main/java/com/xpn/xwiki/objects/meta/UsersMetaClass.java
xwiki/trunk/src/main/java/com/xpn/xwiki/user/impl/LDAP/LDAPAuthServiceImpl.java
xwiki/trunk/src/main/java/com/xpn/xwiki/user/impl/exo/ExoAuthServiceImpl.java
xwiki/trunk/src/main/java/com/xpn/xwiki/user/impl/xwiki/XWikiAuthServiceImpl.java
xwiki/trunk/src/main/web/templates/editrights.vm
Log:
New rights page with lists with free form field to add manually users and groups
Lists can be configured to not preload the userlist in case of wikis with many users
Corrected superadmin login broken
Modified: xwiki/trunk/src/main/java/com/xpn/xwiki/objects/classes/GroupsClass.java
===================================================================
--- xwiki/trunk/src/main/java/com/xpn/xwiki/objects/classes/GroupsClass.java 2006-03-08 04:03:42 UTC (rev 966)
+++ xwiki/trunk/src/main/java/com/xpn/xwiki/objects/classes/GroupsClass.java 2006-03-08 08:36:16 UTC (rev 967)
@@ -2,13 +2,15 @@
import com.xpn.xwiki.XWikiContext;
import com.xpn.xwiki.XWikiException;
+import com.xpn.xwiki.objects.meta.PropertyMetaClass;
+import com.xpn.xwiki.objects.StringProperty;
+import com.xpn.xwiki.objects.BaseProperty;
import com.xpn.xwiki.objects.BaseCollection;
-import com.xpn.xwiki.objects.BaseProperty;
-import com.xpn.xwiki.objects.StringProperty;
-import com.xpn.xwiki.objects.meta.PropertyMetaClass;
+import org.apache.ecs.xhtml.select;
+import org.apache.ecs.xhtml.option;
+import org.apache.ecs.xhtml.input;
+import org.apache.ecs.xhtml.button;
import org.apache.commons.lang.StringUtils;
-import org.apache.ecs.xhtml.option;
-import org.apache.ecs.xhtml.select;
import java.util.ArrayList;
import java.util.Iterator;
@@ -19,6 +21,7 @@
public GroupsClass(PropertyMetaClass wclass) {
super("groupslist", "Groups List", wclass);
setSize(6);
+ setUsesList(true);
}
public GroupsClass() {
@@ -35,17 +38,17 @@
}
- if (list.contains("XWiki.XWikiAllGroup")) {
- list.remove("XWiki.XWikiAllGroup");
- list.add(0, "XWiki.XWikiAllGroup");
- if ((context.getWiki().isVirtual() && (!context.getDatabase().equals("xwiki")))) {
- list.remove("xwiki:XWiki.XWikiAllGroup");
- list.add(0, "xwiki:XWiki.XWikiAllGroup");
- }
- }
return list;
}
+ public boolean isUsesList() {
+ return (getIntValue("usesList")==1);
+ }
+
+ public void setUsesList(boolean usesList) {
+ setIntValue("usesList",usesList ? 1 : 0);
+ }
+
public BaseProperty newProperty() {
return new StringProperty();
}
@@ -66,7 +69,10 @@
}
public String getText(String value, XWikiContext context) {
- return context.getWiki().getUserName(value, null, false, context);
+ if (value.indexOf(":")!=-1)
+ return value;
+ else
+ return value.substring(value.lastIndexOf(".")+1);
}
public static List getListFromString(String value) {
@@ -86,19 +92,37 @@
select.setMultiple(isMultiSelect());
select.setSize(getSize());
- List list = getList(context);
+ List list;
+ if (isUsesList())
+ list = getList(context);
+ else
+ list = new ArrayList();
+
List selectlist;
- BaseProperty prop = (BaseProperty) object.safeget(name);
- if (prop == null) {
+ BaseProperty prop = (BaseProperty)object.safeget(name);
+ if (prop==null) {
selectlist = new ArrayList();
} else {
- selectlist = getListFromString((String) prop.getValue());
+ selectlist = getListFromString((String)prop.getValue());
}
+ list.remove("XWiki.XWikiAllGroup");
+ list.add(0,"XWiki.XWikiAllGroup");
+ if ((context.getWiki().isVirtual()&&(!context.getDatabase().equals("xwiki")))) {
+ list.remove("xwiki:XWiki.XWikiAllGroup");
+ list.add(1,"xwiki:XWiki.XWikiAllGroup");
+ }
+
// Add options from Set
- for (Iterator it = list.iterator(); it.hasNext();) {
+
+ for (Iterator it=selectlist.iterator();it.hasNext();) {
String value = it.next().toString();
+ if (!list.contains(value))
+ list.add(value);
+ }
+ for (Iterator it=list.iterator();it.hasNext();) {
+ String value = it.next().toString();
option option = new option(value, value);
option.addElement(getText(value, context));
if (selectlist.contains(value))
@@ -107,5 +131,24 @@
}
buffer.append(select.toString());
+
+ if (!isUsesList()) {
+ input in = new input();
+ in.setName(prefix + "newgroup");
+ in.setSize(15);
+ buffer.append("<br />");
+ buffer.append(in.toString());
+
+ button button = new button();
+ button.setTagText("Add");
+
+ button.setOnClick("addGroup(this.form,'" + prefix + "'); return false;");
+ buffer.append(button.toString());
+ }
+
+ input in = new input();
+ in.setType("hidden");
+ in.setName(prefix + name);
+ buffer.append(in.toString());
}
}
Modified: xwiki/trunk/src/main/java/com/xpn/xwiki/objects/classes/LevelsClass.java
===================================================================
--- xwiki/trunk/src/main/java/com/xpn/xwiki/objects/classes/LevelsClass.java 2006-03-08 04:03:42 UTC (rev 966)
+++ xwiki/trunk/src/main/java/com/xpn/xwiki/objects/classes/LevelsClass.java 2006-03-08 08:36:16 UTC (rev 967)
@@ -9,6 +9,7 @@
import org.apache.commons.lang.StringUtils;
import org.apache.ecs.xhtml.option;
import org.apache.ecs.xhtml.select;
+import org.apache.ecs.xhtml.input;
import java.util.ArrayList;
import java.util.Iterator;
@@ -105,5 +106,9 @@
}
buffer.append(select.toString());
+ input in = new input();
+ in.setType("hidden");
+ in.setName(prefix + name);
+ buffer.append(in.toString());
}
}
Modified: xwiki/trunk/src/main/java/com/xpn/xwiki/objects/classes/ListClass.java
===================================================================
--- xwiki/trunk/src/main/java/com/xpn/xwiki/objects/classes/ListClass.java 2006-03-08 04:03:42 UTC (rev 966)
+++ xwiki/trunk/src/main/java/com/xpn/xwiki/objects/classes/ListClass.java 2006-03-08 08:36:16 UTC (rev 967)
@@ -1,26 +1,26 @@
-/*
- * Copyright 2006, XpertNet SARL, and individual contributors as indicated
- * by the contributors.txt.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- *
- * @author ludovic
- * @author erwan
- * @author sdumitriu
- */
+/*
+ * Copyright 2006, XpertNet SARL, and individual contributors as indicated
+ * by the contributors.txt.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ *
+ * @author ludovic
+ * @author erwan
+ * @author sdumitriu
+ */
package com.xpn.xwiki.objects.classes;
@@ -71,6 +71,8 @@
setStringValue("displayType", type);
}
+
+
public int getSize() {
return getIntValue("size");
}
Modified: xwiki/trunk/src/main/java/com/xpn/xwiki/objects/classes/UsersClass.java
===================================================================
--- xwiki/trunk/src/main/java/com/xpn/xwiki/objects/classes/UsersClass.java 2006-03-08 04:03:42 UTC (rev 966)
+++ xwiki/trunk/src/main/java/com/xpn/xwiki/objects/classes/UsersClass.java 2006-03-08 08:36:16 UTC (rev 967)
@@ -2,13 +2,15 @@
import com.xpn.xwiki.XWikiContext;
import com.xpn.xwiki.XWikiException;
+import com.xpn.xwiki.objects.meta.PropertyMetaClass;
+import com.xpn.xwiki.objects.BaseProperty;
import com.xpn.xwiki.objects.BaseCollection;
-import com.xpn.xwiki.objects.BaseProperty;
import com.xpn.xwiki.objects.StringProperty;
-import com.xpn.xwiki.objects.meta.PropertyMetaClass;
+import org.apache.ecs.xhtml.select;
+import org.apache.ecs.xhtml.option;
+import org.apache.ecs.xhtml.input;
+import org.apache.ecs.xhtml.*;
import org.apache.commons.lang.StringUtils;
-import org.apache.ecs.xhtml.option;
-import org.apache.ecs.xhtml.select;
import java.util.ArrayList;
import java.util.Iterator;
@@ -19,6 +21,7 @@
public UsersClass(PropertyMetaClass wclass) {
super("userslist", "Users List", wclass);
setSize(6);
+ setUsesList(true);
}
public UsersClass() {
@@ -34,12 +37,17 @@
list = new ArrayList();
}
-
- list.remove("XWiki.XWikiGuest");
- list.add(0, "XWiki.XWikiGuest");
return list;
}
+ public boolean isUsesList() {
+ return (getIntValue("usesList")==1);
+ }
+
+ public void setUsesList(boolean usesList) {
+ setIntValue("usesList",usesList ? 1 : 0);
+ }
+
public BaseProperty newProperty() {
return new StringProperty();
}
@@ -79,20 +87,35 @@
select select = new select(prefix + name, 1);
select.setMultiple(isMultiSelect());
select.setSize(getSize());
+ List list;
+ if (isUsesList())
+ list = getList(context);
+ else
+ list = new ArrayList();
- List list = getList(context);
List selectlist;
-
- BaseProperty prop = (BaseProperty) object.safeget(name);
- if (prop == null) {
+ BaseProperty prop = (BaseProperty)object.safeget(name);
+ if (prop==null) {
selectlist = new ArrayList();
} else {
- selectlist = getListFromString((String) prop.getValue());
+ selectlist = getListFromString((String)prop.getValue());
}
// Add options from Set
- for (Iterator it = list.iterator(); it.hasNext();) {
+
+ for (Iterator it=selectlist.iterator();it.hasNext();) {
String value = it.next().toString();
+ if (!list.contains(value))
+ list.add(value);
+ }
+
+ // Make sure we have guest
+ list.remove("XWiki.XWikiGuest");
+ list.add(0,"XWiki.XWikiGuest");
+
+ // Add options from Set
+ for (Iterator it=list.iterator();it.hasNext();) {
+ String value = it.next().toString();
option option = new option(value, value);
option.addElement(getText(value, context));
if (selectlist.contains(value))
@@ -101,5 +124,24 @@
}
buffer.append(select.toString());
+
+ if (!isUsesList()) {
+ input in = new input();
+ in.setName(prefix+"newuser");
+ in.setSize(15);
+ buffer.append("<br />");
+ buffer.append(in.toString());
+
+ button button = new button();
+ button.setTagText("Add");
+
+ button.setOnClick("addUser(this.form,'" + prefix + "'); return false;");
+ buffer.append(button.toString());
+ }
+
+ input in = new input();
+ in.setType("hidden");
+ in.setName(prefix + name);
+ buffer.append(in.toString());
}
}
Modified: xwiki/trunk/src/main/java/com/xpn/xwiki/objects/meta/GroupsMetaClass.java
===================================================================
--- xwiki/trunk/src/main/java/com/xpn/xwiki/objects/meta/GroupsMetaClass.java 2006-03-08 04:03:42 UTC (rev 966)
+++ xwiki/trunk/src/main/java/com/xpn/xwiki/objects/meta/GroupsMetaClass.java 2006-03-08 08:36:16 UTC (rev 967)
@@ -1,6 +1,7 @@
package com.xpn.xwiki.objects.meta;
import com.xpn.xwiki.objects.classes.GroupsClass;
+import com.xpn.xwiki.objects.classes.BooleanClass;
import com.xpn.xwiki.objects.BaseCollection;
import com.xpn.xwiki.XWikiContext;
@@ -10,6 +11,12 @@
setPrettyName("Groups List Class");
setName(GroupsClass.class.getName());
+ BooleanClass uselist_class = new BooleanClass(this);
+ uselist_class.setName("usesList");
+ uselist_class.setPrettyName("Uses List");
+ uselist_class.setDisplayType("yesno");
+ safeput("usesList", uselist_class);
+
}
public BaseCollection newObject(XWikiContext context) {
Modified: xwiki/trunk/src/main/java/com/xpn/xwiki/objects/meta/LevelsMetaClass.java
===================================================================
--- xwiki/trunk/src/main/java/com/xpn/xwiki/objects/meta/LevelsMetaClass.java 2006-03-08 04:03:42 UTC (rev 966)
+++ xwiki/trunk/src/main/java/com/xpn/xwiki/objects/meta/LevelsMetaClass.java 2006-03-08 08:36:16 UTC (rev 967)
@@ -2,6 +2,7 @@
import com.xpn.xwiki.objects.classes.GroupsClass;
import com.xpn.xwiki.objects.classes.LevelsClass;
+import com.xpn.xwiki.objects.classes.BooleanClass;
import com.xpn.xwiki.objects.BaseCollection;
import com.xpn.xwiki.XWikiContext;
@@ -10,7 +11,6 @@
super();
setPrettyName("Level Class");
setName(LevelsClass.class.getName());
-
}
public BaseCollection newObject(XWikiContext context) {
Modified: xwiki/trunk/src/main/java/com/xpn/xwiki/objects/meta/ListMetaClass.java
===================================================================
--- xwiki/trunk/src/main/java/com/xpn/xwiki/objects/meta/ListMetaClass.java 2006-03-08 04:03:42 UTC (rev 966)
+++ xwiki/trunk/src/main/java/com/xpn/xwiki/objects/meta/ListMetaClass.java 2006-03-08 08:36:16 UTC (rev 967)
@@ -1,23 +1,23 @@
-/*
- * Copyright 2006, XpertNet SARL, and individual contributors as indicated
- * by the contributors.txt.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- *
- */
+/*
+ * Copyright 2006, XpertNet SARL, and individual contributors as indicated
+ * by the contributors.txt.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ *
+ */
package com.xpn.xwiki.objects.meta;
Modified: xwiki/trunk/src/main/java/com/xpn/xwiki/objects/meta/UsersMetaClass.java
===================================================================
--- xwiki/trunk/src/main/java/com/xpn/xwiki/objects/meta/UsersMetaClass.java 2006-03-08 04:03:42 UTC (rev 966)
+++ xwiki/trunk/src/main/java/com/xpn/xwiki/objects/meta/UsersMetaClass.java 2006-03-08 08:36:16 UTC (rev 967)
@@ -3,6 +3,7 @@
import com.xpn.xwiki.objects.classes.StaticListClass;
import com.xpn.xwiki.objects.classes.StringClass;
import com.xpn.xwiki.objects.classes.UsersClass;
+import com.xpn.xwiki.objects.classes.BooleanClass;
import com.xpn.xwiki.objects.BaseCollection;
import com.xpn.xwiki.XWikiContext;
@@ -12,8 +13,15 @@
setPrettyName("Users List Class");
setName(UsersClass.class.getName());
+ BooleanClass uselist_class = new BooleanClass(this);
+ uselist_class.setName("usesList");
+ uselist_class.setPrettyName("Uses List");
+ uselist_class.setDisplayType("yesno");
+ safeput("usesList", uselist_class);
}
+
+
public BaseCollection newObject(XWikiContext context) {
return new UsersMetaClass();
}
Modified: xwiki/trunk/src/main/java/com/xpn/xwiki/user/impl/LDAP/LDAPAuthServiceImpl.java
===================================================================
--- xwiki/trunk/src/main/java/com/xpn/xwiki/user/impl/LDAP/LDAPAuthServiceImpl.java 2006-03-08 04:03:42 UTC (rev 966)
+++ xwiki/trunk/src/main/java/com/xpn/xwiki/user/impl/LDAP/LDAPAuthServiceImpl.java 2006-03-08 08:36:16 UTC (rev 967)
@@ -58,7 +58,7 @@
if (username.equals(superadmin)) {
String superadminpassword = context.getWiki().Param("xwiki.superadminpassword");
if ((superadminpassword != null) && (superadminpassword.equals(password))) {
- principal = new SimplePrincipal("superadmin");
+ principal = new SimplePrincipal("XWiki.superadmin");
return principal;
} else {
return null;
Modified: xwiki/trunk/src/main/java/com/xpn/xwiki/user/impl/exo/ExoAuthServiceImpl.java
===================================================================
--- xwiki/trunk/src/main/java/com/xpn/xwiki/user/impl/exo/ExoAuthServiceImpl.java 2006-03-08 04:03:42 UTC (rev 966)
+++ xwiki/trunk/src/main/java/com/xpn/xwiki/user/impl/exo/ExoAuthServiceImpl.java 2006-03-08 08:36:16 UTC (rev 967)
@@ -77,7 +77,7 @@
if (username.equals(superadmin)) {
String superadminpassword = context.getWiki().Param("xwiki.superadminpassword");
if ((superadminpassword != null) && (superadminpassword.equals(password))) {
- return new SimplePrincipal("superadmin");
+ return new SimplePrincipal("XWiki.superadmin");
} else {
return null;
}
Modified: xwiki/trunk/src/main/java/com/xpn/xwiki/user/impl/xwiki/XWikiAuthServiceImpl.java
===================================================================
--- xwiki/trunk/src/main/java/com/xpn/xwiki/user/impl/xwiki/XWikiAuthServiceImpl.java 2006-03-08 04:03:42 UTC (rev 966)
+++ xwiki/trunk/src/main/java/com/xpn/xwiki/user/impl/xwiki/XWikiAuthServiceImpl.java 2006-03-08 08:36:16 UTC (rev 967)
@@ -201,7 +201,7 @@
if (username.equals(superadmin)) {
String superadminpassword = context.getWiki().Param("xwiki.superadminpassword");
if ((superadminpassword != null) && (superadminpassword.equals(password))) {
- principal = new SimplePrincipal("superadmin");
+ principal = new SimplePrincipal("XWiki.superadmin");
return principal;
} else {
return null;
Modified: xwiki/trunk/src/main/web/templates/editrights.vm
===================================================================
--- xwiki/trunk/src/main/web/templates/editrights.vm 2006-03-08 04:03:42 UTC (rev 966)
+++ xwiki/trunk/src/main/web/templates/editrights.vm 2006-03-08 08:36:16 UTC (rev 967)
@@ -11,12 +11,49 @@
<!--
var currentfield = "";
function show(fieldname) {
- if (currentfield!="")
- document.getElementById(currentfield).style.display="none";
- document.getElementById(fieldname).style.display="block";
- currentfield = fieldname;
+ if (currentfield!="")
+ document.getElementById(currentfield).style.display="none";
+ document.getElementById(fieldname).style.display="block";
+ currentfield = fieldname;
}
-// -->
+
+function addUser(form, prefix) {
+ var username = form[prefix + "newuser"].value;
+ var select = form[prefix + "users"][0];
+ if (username != null && username != "") {
+ length = select.options.length ;
+ dusername = username;
+ if (username.indexOf('.')==-1) {
+ xusername = "XWiki." + username;
+ }
+ else {
+ if (username.indexOf(":")==-1) {
+ dusername = username.substring(username.lastIndexOf(".")+1);
+ }
+ xusername = username
+ }
+ select.options[length] = new Option(dusername, xusername, true);
+ }
+}
+
+function addGroup(form, prefix) {
+ var groupname = form[prefix + "newgroup"].value;
+ var select = form[prefix + "groups"][0];
+ if (groupname != null && groupname != "") {
+ length = select.options.length ;
+ dgroupname = groupname;
+ if (groupname.indexOf('.')==-1) {
+ xgroupname = "XWiki." + groupname;
+ }
+ else {
+ if (groupname.indexOf(":")==-1)
+ dgroupname = groupname.substring(groupname.lastIndexOf(".")+1);
+ xgroupname = groupname
+ }
+ select.options[length] = new Option(dgroupname, xgroupname, true);
+ }
+}
+-->
</script>
<div id="xwikicontent" class="large">
<div id="columns">
@@ -44,13 +81,13 @@
#set($class = $obj.xWikiClass)
<tr>
<td align="center">$!{obj.number}</td>
- <td align="center">$!doc.displayEdit($class.users,"${class.name}_${obj.number}_",$obj)</td>
+ <td align="center">$!doc.displayEdit($class.users,"${class.name}_${obj.number}_",$obj) <br>
<td align="center">$!doc.displayEdit($class.groups,"${class.name}_${obj.number}_",$obj)</td>
<td align="center">$!doc.displayEdit($class.levels,"${class.name}_${obj.number}_",$obj)</td>
<td align="center">$!doc.displayEdit($class.allow,"${class.name}_${obj.number}_",$obj)</td>
<td align="center"><a href="$doc.getURL("objectremove", "classname=${class.name}&classid=${obj.number}&xredirect=${xwiki.getURLEncoded($redirect)}")"
onclick="return confirm('$msg.get("confirmobjectremove")')">
- $msg.get("removethisrightentry")</a></td>
+ $msg.get("remove")</a></td>
</tr>
#end
</table>
@@ -74,10 +111,9 @@
<input type="button" value="$msg.get("saverights")" onclick="document.forms.update.submit()" />
</p>
<br />
-<h3>$msg.get("currentrights")</h3>
-<a href="" onclick="showobjects('$class.name'); return false;">$class.name</a><br />
<div id="class_${class.name}">
<br /><br />
+
<h3>$msg.get("addrightentry")</h3>
<form id="objectadd" method="post" action="$doc.getURL("objectadd")" onsubmit="cancelCancelEdit()">
<p>
More information about the Xwiki-notifications
mailing list