[Yanel-commits] rev 23322 - in public/yanel/trunk/src/contributions/resources: resource-creator/src/java/org/wyona/yanel/impl/resources yanel-user/src/java/org/wyona/yanel/impl/resources

[josias at wyona.com]

Author: josias
Date: 2007-03-19 22:49:42 +0100 (Mon, 19 Mar 2007)
New Revision: 23322

Modified:
   public/yanel/trunk/src/contributions/resources/resource-creator/src/java/org/wyona/yanel/impl/resources/ResourceCreatorResource.java
   public/yanel/trunk/src/contributions/resources/yanel-user/src/java/org/wyona/yanel/impl/resources/YanelUserResource.java
Log:
Grant admin group access to new users' profiles and fix bug in resource creator. see bug #5116, thanks to Paloma

Modified: public/yanel/trunk/src/contributions/resources/resource-creator/src/java/org/wyona/yanel/impl/resources/ResourceCreatorResource.java
===================================================================
--- public/yanel/trunk/src/contributions/resources/resource-creator/src/java/org/wyona/yanel/impl/resources/ResourceCreatorResource.java	2007-03-19 20:53:29 UTC (rev 23321)
+++ public/yanel/trunk/src/contributions/resources/resource-creator/src/java/org/wyona/yanel/impl/resources/ResourceCreatorResource.java	2007-03-19 21:49:42 UTC (rev 23322)
@@ -389,13 +389,16 @@
 
         Path pathOfNewResource = null;
         String createName = getRequest().getParameter("create-name");
+        
         if(parent.equals("null")) {
             // if pathOfResourceCreator is ROOT
             pathOfNewResource = new Path("/" + createName);
+        } else if(parent.toString().equals("/")){
+            pathOfNewResource = new Path(parent + createName);
         } else {
-            pathOfNewResource = new Path(parent + "/" + createName);
+            pathOfNewResource = new Path(parent + "/" + createName);            
         }
-
+        
         log.error("DEBUG: Path of new resource: " + pathOfNewResource);
 
         String rtps = getRequest().getParameter("resource-type");

Modified: public/yanel/trunk/src/contributions/resources/yanel-user/src/java/org/wyona/yanel/impl/resources/YanelUserResource.java
===================================================================
--- public/yanel/trunk/src/contributions/resources/yanel-user/src/java/org/wyona/yanel/impl/resources/YanelUserResource.java	2007-03-19 20:53:29 UTC (rev 23321)
+++ public/yanel/trunk/src/contributions/resources/yanel-user/src/java/org/wyona/yanel/impl/resources/YanelUserResource.java	2007-03-19 21:49:42 UTC (rev 23322)
@@ -63,6 +63,8 @@
     protected static final String WORLD = "world";
 
     protected static final String USER = "user";
+    
+    protected static final String GROUP = "group";
 
     protected static final String PERMISSION_ATTR = "permission";
 
@@ -307,8 +309,8 @@
         worldNode.setAttribute(PERMISSION_ATTR, "false");
         child.addChild(worldNode);
 
-        DefaultConfiguration userNode = new DefaultConfiguration(USER);
-        userNode.setAttribute(ID_ATTR, "lenya");
+        DefaultConfiguration userNode = new DefaultConfiguration(GROUP);
+        userNode.setAttribute(ID_ATTR, "admin");
         userNode.setAttribute(PERMISSION_ATTR, "true");
         child.addChild(userNode);
 
@@ -321,8 +323,8 @@
         child.setAttribute(ID_ATTR, "open");
         config.addChild(child);
 
-        userNode = new DefaultConfiguration(USER);
-        userNode.setAttribute(ID_ATTR, "lenya");
+        userNode = new DefaultConfiguration(GROUP);
+        userNode.setAttribute(ID_ATTR, "admin");
         userNode.setAttribute(PERMISSION_ATTR, "true");
         child.addChild(userNode);
 
@@ -335,8 +337,8 @@
         child.setAttribute(ID_ATTR, "write");
         config.addChild(child);
 
-        userNode = new DefaultConfiguration(USER);
-        userNode.setAttribute(ID_ATTR, "lenya");
+        userNode = new DefaultConfiguration(GROUP);
+        userNode.setAttribute(ID_ATTR, "admin");
         userNode.setAttribute(PERMISSION_ATTR, "true");
         child.addChild(userNode);