Author: raintang
Date: 2009-08-24 11:36:15 +0200 (Mon, 24 Aug 2009)
New Revision: 38080
Modified:
CMSContainer/trunk/CMSContainer/cmsc/contentrepository/src/java/com/finalist/cmsc/repository/forms/MoveAssetToChannelAction.java
Log:
CMSC-1449 Wrong confirm message when editing a content or asset element
Modified:
CMSContainer/trunk/CMSContainer/cmsc/contentrepository/src/java/com/finalist/cmsc/repository/forms/MoveAssetToChannelAction.java
===================================================================
---
CMSContainer/trunk/CMSContainer/cmsc/contentrepository/src/java/com/finalist/cmsc/repository/forms/MoveAssetToChannelAction.java
2009-08-24 09:35:35 UTC (rev 38079)
+++
CMSContainer/trunk/CMSContainer/cmsc/contentrepository/src/java/com/finalist/cmsc/repository/forms/MoveAssetToChannelAction.java
2009-08-24 09:36:15 UTC (rev 38080)
@@ -9,21 +9,28 @@
*/
package com.finalist.cmsc.repository.forms;
-import java.net.URLEncoder;
-import java.util.*;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Locale;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import org.apache.commons.lang.StringUtils;
-import org.apache.struts.action.*;
+import org.apache.struts.action.ActionForm;
+import org.apache.struts.action.ActionForward;
+import org.apache.struts.action.ActionMapping;
import org.apache.struts.util.MessageResources;
-import org.mmbase.bridge.*;
+import org.mmbase.bridge.Cloud;
+import org.mmbase.bridge.Node;
+import org.mmbase.bridge.NodeIterator;
+import org.mmbase.bridge.NodeList;
+import org.mmbase.bridge.RelationManager;
import com.finalist.cmsc.mmbase.RelationUtil;
-import com.finalist.cmsc.security.SecurityUtil;
import com.finalist.cmsc.services.workflow.Workflow;
import com.finalist.cmsc.struts.MMBaseAction;
+import com.finalist.cmsc.struts.StrutsUtil;
public class MoveAssetToChannelAction extends MMBaseAction {
@@ -49,14 +56,7 @@
String message = "";
String[] numbers = objectNumber.split(",");
- Node userNode = SecurityUtil.getUserNode(cloud);
- String language = userNode.getStringValue("language");
- Locale locale;
- if(StringUtils.isEmpty(language)){
- locale = request.getLocale();
- }else{
- locale = new Locale(language);
- }
+ Locale locale = StrutsUtil.getLocale(request);
MessageResources resources = getResources(request, "REPOSITORY");
int successCount=0;
int failureCount=0;
_______________________________________________
Cvs mailing list
Cvs@lists.mmbase.org
http://lists.mmbase.org/mailman/listinfo/cvs
