r1063 - in xwiki/trunk/src/main: java/com/xpn/xwiki/objects/classes web/templates

[Ludovic Dubost]

Author: ludovic
Date: 2006-05-06 23:02:26 +0200 (Sat, 06 May 2006)
New Revision: 1063

Modified:
   xwiki/trunk/src/main/java/com/xpn/xwiki/objects/classes/LevelsClass.java
   xwiki/trunk/src/main/web/templates/editobject.vm
Log:
Fix for new rights interface. Using edit Object for the XWiki Prefs would loose admin and programming rights

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-05-04 12:07:23 UTC (rev 1062)
+++ xwiki/trunk/src/main/java/com/xpn/xwiki/objects/classes/LevelsClass.java	2006-05-06 21:02:26 UTC (rev 1063)
@@ -35,6 +35,7 @@
             list = new ArrayList();
 
         }
+
         if (!"1".equals(context.getRequest().get("global"))) {
             list.remove("admin");
             list.remove("programming");
@@ -100,6 +101,9 @@
             String value = it.next().toString();
             option option = new option(value, value);
             option.addElement(getText(value, context));
+            // If we don't have this option in the list then add it
+            if (!list.contains(value))
+                    list.add(value);
             if (selectlist.contains(value))
                 option.setSelected(true);
             select.addElement(option);

Modified: xwiki/trunk/src/main/web/templates/editobject.vm
===================================================================
--- xwiki/trunk/src/main/web/templates/editobject.vm	2006-05-04 12:07:23 UTC (rev 1062)
+++ xwiki/trunk/src/main/web/templates/editobject.vm	2006-05-06 21:02:26 UTC (rev 1063)
@@ -12,6 +12,43 @@
   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="columns">