[MMBASE SCM] r36644 - in CMSContainer/branches/b1_6/CMSContainer/cmsc/contentrepository/src: java/com/finalist/cmsc/repository/forms webapp/editors/repository

[raintang]

Author: raintang
Date: 2009-07-08 11:36:40 +0200 (Wed, 08 Jul 2009)
New Revision: 36644

Modified:
   
CMSContainer/branches/b1_6/CMSContainer/cmsc/contentrepository/src/java/com/finalist/cmsc/repository/forms/AssetAction.java
   
CMSContainer/branches/b1_6/CMSContainer/cmsc/contentrepository/src/java/com/finalist/cmsc/repository/forms/MoveAssetToChannelAction.java
   
CMSContainer/branches/b1_6/CMSContainer/cmsc/contentrepository/src/webapp/editors/repository/elementlist.jsp
Log:
CMSC- 1449  Wrong confirm message when editing a content or asset element

Modified: 
CMSContainer/branches/b1_6/CMSContainer/cmsc/contentrepository/src/java/com/finalist/cmsc/repository/forms/AssetAction.java
===================================================================
--- 
CMSContainer/branches/b1_6/CMSContainer/cmsc/contentrepository/src/java/com/finalist/cmsc/repository/forms/AssetAction.java
 2009-07-08 09:20:17 UTC (rev 36643)
+++ 
CMSContainer/branches/b1_6/CMSContainer/cmsc/contentrepository/src/java/com/finalist/cmsc/repository/forms/AssetAction.java
 2009-07-08 09:36:40 UTC (rev 36644)
@@ -123,7 +123,10 @@
          addToRequest(request, "exist", exist);
          request.getSession().setAttribute("show", show);
          request.getSession().setAttribute("imageOnly", imageOnly);
-
+         if (request.getSession().getAttribute("message") != null) {
+            addToRequest(request, "message", (String) 
request.getSession().getAttribute("message"));
+            request.getSession().removeAttribute("message");
+         }
          Map<String, Node> createdNumbers = new HashMap<String, Node>();
          for (Iterator<Node> iter = created.iterator(); iter.hasNext();) {
             Node createdElement = iter.next();

Modified: 
CMSContainer/branches/b1_6/CMSContainer/cmsc/contentrepository/src/java/com/finalist/cmsc/repository/forms/MoveAssetToChannelAction.java
===================================================================
--- 
CMSContainer/branches/b1_6/CMSContainer/cmsc/contentrepository/src/java/com/finalist/cmsc/repository/forms/MoveAssetToChannelAction.java
    2009-07-08 09:20:17 UTC (rev 36643)
+++ 
CMSContainer/branches/b1_6/CMSContainer/cmsc/contentrepository/src/java/com/finalist/cmsc/repository/forms/MoveAssetToChannelAction.java
    2009-07-08 09:36:40 UTC (rev 36644)
@@ -105,7 +105,7 @@
       if(StringUtils.isNotEmpty(direction)) {
          path += "&direction="+direction;
       }
-      path += "&message=" + URLEncoder.encode(message, "UTF-8");
+      request.getSession().setAttribute("message", message);
       ActionForward actionForward = new ActionForward(path);
       actionForward.setRedirect(true);
       return actionForward;

Modified: 
CMSContainer/branches/b1_6/CMSContainer/cmsc/contentrepository/src/webapp/editors/repository/elementlist.jsp
===================================================================
--- 
CMSContainer/branches/b1_6/CMSContainer/cmsc/contentrepository/src/webapp/editors/repository/elementlist.jsp
        2009-07-08 09:20:17 UTC (rev 36643)
+++ 
CMSContainer/branches/b1_6/CMSContainer/cmsc/contentrepository/src/webapp/editors/repository/elementlist.jsp
        2009-07-08 09:36:40 UTC (rev 36644)
@@ -8,8 +8,8 @@
 <cmscedit:head title="content.title">
     <script src="content.js" type="text/javascript"></script>
     <script type="text/javascript">
-    <c:if test="${not empty param.message}">
-    addLoadEvent(alert('${param.message}'));
+    <c:if test="${not empty message}">
+    addLoadEvent(alert('${message}'));
     </c:if>
     <c:if test="${not empty param.refreshchannel}">
     addLoadEvent(refreshChannels);

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