[MMBASE SCM] r42243 - CMSContainer/trunk/CMSContainer/cmsc/contentrepository/src/java/com/finalist/cmsc/recyclebin/forms

[kbettinger]

Author: kbettinger
Date: 2010-05-20 15:15:27 +0200 (Thu, 20 May 2010)
New Revision: 42243

Modified:
   
CMSContainer/trunk/CMSContainer/cmsc/contentrepository/src/java/com/finalist/cmsc/recyclebin/forms/RestoreAction.java
   
CMSContainer/trunk/CMSContainer/cmsc/contentrepository/src/java/com/finalist/cmsc/recyclebin/forms/RestoreAssetAction.java
Log:
CMSC-1694

Modified: 
CMSContainer/trunk/CMSContainer/cmsc/contentrepository/src/java/com/finalist/cmsc/recyclebin/forms/RestoreAction.java
===================================================================
--- 
CMSContainer/trunk/CMSContainer/cmsc/contentrepository/src/java/com/finalist/cmsc/recyclebin/forms/RestoreAction.java
       2010-05-20 09:57:18 UTC (rev 42242)
+++ 
CMSContainer/trunk/CMSContainer/cmsc/contentrepository/src/java/com/finalist/cmsc/recyclebin/forms/RestoreAction.java
       2010-05-20 13:15:27 UTC (rev 42243)
@@ -71,7 +71,13 @@
          }
 
       }
-      ActionForward ret = new ActionForward(returnurl+"&fresh=true");
+      ActionForward ret;
+      if(returnurl.contains(".jsp?")) {
+         ret = new ActionForward(returnurl+"&fresh=true");
+      } else {
+         ret = new ActionForward(returnurl+"?fresh=true");
+      }
+         
       ret.setRedirect(true);
      // addToRequest(request, "fresh", "true");
       return ret;

Modified: 
CMSContainer/trunk/CMSContainer/cmsc/contentrepository/src/java/com/finalist/cmsc/recyclebin/forms/RestoreAssetAction.java
===================================================================
--- 
CMSContainer/trunk/CMSContainer/cmsc/contentrepository/src/java/com/finalist/cmsc/recyclebin/forms/RestoreAssetAction.java
  2010-05-20 09:57:18 UTC (rev 42242)
+++ 
CMSContainer/trunk/CMSContainer/cmsc/contentrepository/src/java/com/finalist/cmsc/recyclebin/forms/RestoreAssetAction.java
  2010-05-20 13:15:27 UTC (rev 42243)
@@ -64,7 +64,12 @@
             Workflow.create(objectNode, null);
          }
       }
-      ActionForward ret = new ActionForward(returnurl+"&fresh=true");
+      ActionForward ret;
+      if(returnurl.contains(".jsp?")) {
+         ret = new ActionForward(returnurl+"&fresh=true");
+      } else {
+         ret = new ActionForward(returnurl+"?fresh=true");
+      }
       ret.setRedirect(true);
      // addToRequest(request, "fresh", "true");
       return ret;

_______________________________________________
Cvs mailing list
Cvs@lists.mmbase.org
http://lists.mmbase.org/mailman/listinfo/cvs