Update of
/var/cvs/contributions/CMSContainer/cmsc/contentrepository/src/java/com/finalist/cmsc/repository/forms
In directory
james.mmbase.org:/tmp/cvs-serv10668/cmsc/contentrepository/src/java/com/finalist/cmsc/repository/forms
Modified Files:
MoveContentToChannelAction.java MoveAssetToChannelAction.java
Log Message:
CMSC-1120 improve the bulk move message
See also:
http://cvs.mmbase.org/viewcvs/contributions/CMSContainer/cmsc/contentrepository/src/java/com/finalist/cmsc/repository/forms
See also: http://www.mmbase.org/jira/browse/CMSC-1120
Index: MoveContentToChannelAction.java
===================================================================
RCS file:
/var/cvs/contributions/CMSContainer/cmsc/contentrepository/src/java/com/finalist/cmsc/repository/forms/MoveContentToChannelAction.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -b -r1.8 -r1.9
--- MoveContentToChannelAction.java 25 Jul 2008 15:54:05 -0000 1.8
+++ MoveContentToChannelAction.java 10 Apr 2009 07:20:23 -0000 1.9
@@ -21,6 +21,7 @@
import org.mmbase.bridge.*;
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;
@@ -46,11 +47,19 @@
int channel = Integer.parseInt(request.getParameter(PARAMETER_CHANNEL));
int newChannel =
Integer.parseInt(request.getParameter(PARAMETER_NEW_CHANNEL));
- String message = null;
+ String message = "";
String[] numbers = objectNumber.split(",");
- Locale locale = request.getLocale();
+ Node userNode = SecurityUtil.getUserNode(cloud);
+ String language = userNode.getStringValue("language");
+ Locale locale;
+ if(StringUtils.isEmpty(language)){
+ locale = request.getLocale();
+ }else{
+ locale = new Locale(language);
+ }
MessageResources resources = getResources(request, "REPOSITORY");
- boolean isSuccess = true;
+ int successCount=0;
+ int failureCount=0;
Node channelNode = cloud.getNode(channel);
Node newChannelNode = cloud.getNode(newChannel);
@@ -89,17 +98,28 @@
nodes.add(elementNode);
Workflow.create(channelNode, remark, nodes);
Workflow.create(newChannelNode, remark, nodes);
- isSuccess = true;
+ successCount++;
}
else {
- isSuccess = false;
+ failureCount++;
}
}
- if(isSuccess) {
- message = resources.getMessage(locale,
"content.movetochannel.success", newChannelNode.getStringValue("name"));
+ if(successCount>0) {
+ if(successCount==1){
+ message += resources.getMessage(locale,
"content.movetochannel.success", newChannelNode.getStringValue("name"));
+ }else{
+ message += resources.getMessage(locale,
"content.massmovetochannel.success", successCount,
newChannelNode.getStringValue("name"));
+ }
+ }
+ if(failureCount>0) {
+ if(successCount>0){
+ message += "\\n";
+ }
+ if(failureCount==1){
+ message += resources.getMessage(locale,
"content.movetochannel.failed", newChannelNode.getStringValue("name"));
+ }else{
+ message += resources.getMessage(locale,
"content.massmovetochannel.failed", failureCount,
newChannelNode.getStringValue("name"));
}
- else {
- message = resources.getMessage(locale,
"content.movetochannel.failed", newChannelNode.getStringValue("name"));
}
String path = mapping.findForward(SUCCESS).getPath() + "?" +
PARAMETER_CHANNEL + "=" + channel;
Index: MoveAssetToChannelAction.java
===================================================================
RCS file:
/var/cvs/contributions/CMSContainer/cmsc/contentrepository/src/java/com/finalist/cmsc/repository/forms/MoveAssetToChannelAction.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- MoveAssetToChannelAction.java 20 Nov 2008 08:53:48 -0000 1.2
+++ MoveAssetToChannelAction.java 10 Apr 2009 07:20:23 -0000 1.3
@@ -21,6 +21,7 @@
import org.mmbase.bridge.*;
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;
@@ -46,11 +47,19 @@
int channel = Integer.parseInt(request.getParameter(PARAMETER_CHANNEL));
int newChannel =
Integer.parseInt(request.getParameter(PARAMETER_NEW_CHANNEL));
- String message = null;
+ String message = "";
String[] numbers = objectNumber.split(",");
- Locale locale = request.getLocale();
+ Node userNode = SecurityUtil.getUserNode(cloud);
+ String language = userNode.getStringValue("language");
+ Locale locale;
+ if(StringUtils.isEmpty(language)){
+ locale = request.getLocale();
+ }else{
+ locale = new Locale(language);
+ }
MessageResources resources = getResources(request, "REPOSITORY");
- boolean isSuccess = true;
+ int successCount=0;
+ int failureCount=0;
Node channelNode = cloud.getNode(channel);
Node newChannelNode = cloud.getNode(newChannel);
@@ -82,17 +91,28 @@
nodes.add(elementNode);
Workflow.create(channelNode, remark, nodes);
Workflow.create(newChannelNode, remark, nodes);
- isSuccess = true;
+ successCount++;
}
else {
- isSuccess = false;
+ failureCount++;
}
}
- if(isSuccess) {
- message = resources.getMessage(locale, "asset.movetochannel.success",
newChannelNode.getStringValue("name"));
+ if(successCount>0) {
+ if(successCount==1){
+ message += resources.getMessage(locale,
"asset.movetochannel.success", newChannelNode.getStringValue("name"));
+ }else{
+ message += resources.getMessage(locale,
"asset.massmovetochannel.success", successCount,
newChannelNode.getStringValue("name"));
+ }
+ }
+ if(failureCount>0) {
+ if(successCount>0){
+ message += "\\n";
+ }
+ if(failureCount==1){
+ message += resources.getMessage(locale,
"asset.movetochannel.failed", newChannelNode.getStringValue("name"));
+ }else{
+ message += resources.getMessage(locale,
"asset.massmovetochannel.failed", failureCount,
newChannelNode.getStringValue("name"));
}
- else {
- message = resources.getMessage(locale, "asset.movetochannel.failed",
newChannelNode.getStringValue("name"));
}
String path = mapping.findForward(SUCCESS).getPath() + "?type=asset&" +
PARAMETER_CHANNEL + "=" + channel;
_______________________________________________
Cvs mailing list
[email protected]
http://lists.mmbase.org/mailman/listinfo/cvs
