You are viewing a plain text version of this content. The canonical link for it is here.
Posted to jetspeed-dev@portals.apache.org by ta...@apache.org on 2007/04/05 00:05:25 UTC

svn commit: r525625 - in /portals/jetspeed-2/trunk/components/portal/src/java/org/apache/jetspeed/layout/impl: UpdateFolderAction.java UpdateLinkAction.java UpdatePageAction.java

Author: taylor
Date: Wed Apr  4 15:05:24 2007
New Revision: 525625

URL: http://svn.apache.org/viewvc?view=rev&rev=525625
Log:
https://issues.apache.org/jira/browse/JS2-669

Modified:
    portals/jetspeed-2/trunk/components/portal/src/java/org/apache/jetspeed/layout/impl/UpdateFolderAction.java
    portals/jetspeed-2/trunk/components/portal/src/java/org/apache/jetspeed/layout/impl/UpdateLinkAction.java
    portals/jetspeed-2/trunk/components/portal/src/java/org/apache/jetspeed/layout/impl/UpdatePageAction.java

Modified: portals/jetspeed-2/trunk/components/portal/src/java/org/apache/jetspeed/layout/impl/UpdateFolderAction.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/trunk/components/portal/src/java/org/apache/jetspeed/layout/impl/UpdateFolderAction.java?view=diff&rev=525625&r1=525624&r2=525625
==============================================================================
--- portals/jetspeed-2/trunk/components/portal/src/java/org/apache/jetspeed/layout/impl/UpdateFolderAction.java (original)
+++ portals/jetspeed-2/trunk/components/portal/src/java/org/apache/jetspeed/layout/impl/UpdateFolderAction.java Wed Apr  4 15:05:24 2007
@@ -143,7 +143,8 @@
             else if (method.equals("copy"))
             {            	   
             	String destination = getActionParameter(requestContext, "destination");
-            	destination = destination + Folder.PATH_SEPARATOR + folder.getName();
+            	String name = getActionParameter(requestContext, RESOURCE_NAME);
+            	destination = destination + Folder.PATH_SEPARATOR + name;
             	pageManager.deepCopyFolder(folder,destination,null);
             }
             else if (method.equals("move"))

Modified: portals/jetspeed-2/trunk/components/portal/src/java/org/apache/jetspeed/layout/impl/UpdateLinkAction.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/trunk/components/portal/src/java/org/apache/jetspeed/layout/impl/UpdateLinkAction.java?view=diff&rev=525625&r1=525624&r2=525625
==============================================================================
--- portals/jetspeed-2/trunk/components/portal/src/java/org/apache/jetspeed/layout/impl/UpdateLinkAction.java (original)
+++ portals/jetspeed-2/trunk/components/portal/src/java/org/apache/jetspeed/layout/impl/UpdateLinkAction.java Wed Apr  4 15:05:24 2007
@@ -144,7 +144,8 @@
             else if (method.equals("copy"))
             {            	
             	String destination = getActionParameter(requestContext, "destination");
-            	destination = destination + Folder.PATH_SEPARATOR + link.getName();
+            	String name = getActionParameter(requestContext, RESOURCE_NAME);
+            	destination = destination + Folder.PATH_SEPARATOR + name;
             	Link newLink = pageManager.copyLink(link, destination);
             	pageManager.updateLink(newLink);
             }

Modified: portals/jetspeed-2/trunk/components/portal/src/java/org/apache/jetspeed/layout/impl/UpdatePageAction.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/trunk/components/portal/src/java/org/apache/jetspeed/layout/impl/UpdatePageAction.java?view=diff&rev=525625&r1=525624&r2=525625
==============================================================================
--- portals/jetspeed-2/trunk/components/portal/src/java/org/apache/jetspeed/layout/impl/UpdatePageAction.java (original)
+++ portals/jetspeed-2/trunk/components/portal/src/java/org/apache/jetspeed/layout/impl/UpdatePageAction.java Wed Apr  4 15:05:24 2007
@@ -169,7 +169,8 @@
             else if (method.equals("copy"))
             {            	
             	String destination = getActionParameter(requestContext, "destination");
-            	destination = destination + Folder.PATH_SEPARATOR + page.getName();           	
+            	String name = getActionParameter(requestContext, RESOURCE_NAME);
+            	destination = destination + Folder.PATH_SEPARATOR + name;           	
             	Page newPage = pageManager.copyPage(page,destination);
             	pageManager.updatePage(newPage);
             }



---------------------------------------------------------------------
To unsubscribe, e-mail: jetspeed-dev-unsubscribe@portals.apache.org
For additional commands, e-mail: jetspeed-dev-help@portals.apache.org