Author: raintang
Date: 2009-09-14 13:08:10 +0200 (Mon, 14 Sep 2009)
New Revision: 38595
Modified:
CMSContainer/trunk/CMSContainer/cmsc/contentrepository/resources/cmsc-repository.properties
CMSContainer/trunk/CMSContainer/cmsc/contentrepository/resources/cmsc-repository_nl.properties
CMSContainer/trunk/CMSContainer/cmsc/contentrepository/resources/cmsc-repository_zh.properties
CMSContainer/trunk/CMSContainer/cmsc/contentrepository/src/java/com/finalist/cmsc/repository/AssetElementUtil.java
CMSContainer/trunk/CMSContainer/cmsc/contentrepository/src/java/com/finalist/cmsc/repository/forms/AssetUploadAction.java
CMSContainer/trunk/CMSContainer/cmsc/contentrepository/src/webapp/editors/repository/assetupload.jsp
Log:
CMSC-1518 Improved messages for asset upload problems
Modified:
CMSContainer/trunk/CMSContainer/cmsc/contentrepository/resources/cmsc-repository.properties
===================================================================
---
CMSContainer/trunk/CMSContainer/cmsc/contentrepository/resources/cmsc-repository.properties
2009-09-14 11:00:10 UTC (rev 38594)
+++
CMSContainer/trunk/CMSContainer/cmsc/contentrepository/resources/cmsc-repository.properties
2009-09-14 11:08:10 UTC (rev 38595)
@@ -432,9 +432,9 @@
assets.upload.submit=Upload
assets.upload.results=Uploaded assets
assets.upload.error.big=The asset you are trying to upload is too large. The
maximum allowed file size is {0} MB
-assets.upload.error.exsit=The asset you are trying to upload already exists in
the repository. You can find this file in the
-assets.upload.error.exsit.channel= {0}
-assets.upload.error.exsit.filename=The existing file is called: {0}
+assets.upload.error.existing=The asset you are trying to upload already exists
in the repository. You can find this file in the
+assets.upload.error.existing.channel= {0}
+assets.upload.error.existing.filename=The existing file is called: {0}
assets.upload.error.multiple=Upload Failed. Possible reasons: <ol><li>the
asset(s) are too big (max 16MB), even though it is zipped in a ZIP-file that is
smaller then the limit.</li><li>the ZIP-file does not contain
files.</li><li>the ZIP-file is secured with a password.</li><li>the ZIP-file is
damaged.</li><li>some files already exist in the system.</li></ol>
asset.upload.explanation=Upload local files to this channel. Also ZIP files
are supported to upload multiple file uploads.
Modified:
CMSContainer/trunk/CMSContainer/cmsc/contentrepository/resources/cmsc-repository_nl.properties
===================================================================
---
CMSContainer/trunk/CMSContainer/cmsc/contentrepository/resources/cmsc-repository_nl.properties
2009-09-14 11:00:10 UTC (rev 38594)
+++
CMSContainer/trunk/CMSContainer/cmsc/contentrepository/resources/cmsc-repository_nl.properties
2009-09-14 11:08:10 UTC (rev 38595)
@@ -429,9 +429,9 @@
assets.upload.submit=Uploaden
assets.upload.results=Toegevoegde assets
assets.upload.error.big=Het bestand dat u wilt uploaden is te groot. U kunt
bestanden uploaden van maximaal is {0} MB
-assets.upload.error.exsit=Het bestand dat u wilt uploaden bestaat reeds in het
CMS.
-assets.upload.error.exsit.channel= U kunt het bestand vinden in de rubriek {0}
-assets.upload.error.exsit.filename=Het bestand heet in die rubriek {0}
+assets.upload.error.existing=Het bestand dat u wilt uploaden bestaat reeds in
het CMS.
+assets.upload.error.existing.channel= U kunt het bestand vinden in de rubriek
{0}
+assets.upload.error.existing.filename=Het bestand heet in die rubriek {0}
assets.upload.error.multiple=Niet alles kon worden geupload. Mogelijke
oorzaken:<ol><li>de bijlage(s) kunnen te groot zijn (max 16MB), ook al is deze
ingepakt in een ZIP-bestand dat kleiner is.</li><li>het ZIP-bestand bevat geen
bijlagen</li><li>het ZIP-bestand is beveiligd met een wachtwoord</li><li>het
ZIP-bestand is beschadigd</li><li>bestanden staan al in het CMS.</li></ol>
asset.upload.explanation=Selecteer een lokaal bestand of een ZIP-bestand dat
meerdere assets bevat.
Modified:
CMSContainer/trunk/CMSContainer/cmsc/contentrepository/resources/cmsc-repository_zh.properties
===================================================================
---
CMSContainer/trunk/CMSContainer/cmsc/contentrepository/resources/cmsc-repository_zh.properties
2009-09-14 11:00:10 UTC (rev 38594)
+++
CMSContainer/trunk/CMSContainer/cmsc/contentrepository/resources/cmsc-repository_zh.properties
2009-09-14 11:08:10 UTC (rev 38595)
@@ -430,9 +430,9 @@
assets.upload.submit=上传
assets.upload.results=上传资源
assets.upload.error.big=您要上传的文件太大. 最大允许上传的文件大小为 {0} MB
-assets.upload.error.exsit=您要上传的文件文件已经在仓库中存在.你能在以下频道找到
-assets.upload.error.exsit.channel= <{0}>
-assets.upload.error.exsit.filename=已存在文件的文件名: {0}
+assets.upload.error.existing=您要上传的文件文件已经在仓库中存在.你能在以下频道找到
+assets.upload.error.existing.channel= <{0}>
+assets.upload.error.existing.filename=已存在文件的文件名: {0}
assets.upload.error.multiple=上传失败.可能的失败原因: <ol><li>文件过大(默认 16MB),
即使是ZIP包中的文件也应小于该限制.</li><li>该zip文件被密码保护.</li><li>该zip文件没有包含资源文件.</li><li>该zip文件可能损坏.</li><li>某些上传文件已在系统中存在.</li></ol>
asset.upload.explanation=选择一个本地的资源文件或者包含若干资源文件的zip文件
Modified:
CMSContainer/trunk/CMSContainer/cmsc/contentrepository/src/java/com/finalist/cmsc/repository/AssetElementUtil.java
===================================================================
---
CMSContainer/trunk/CMSContainer/cmsc/contentrepository/src/java/com/finalist/cmsc/repository/AssetElementUtil.java
2009-09-14 11:00:10 UTC (rev 38594)
+++
CMSContainer/trunk/CMSContainer/cmsc/contentrepository/src/java/com/finalist/cmsc/repository/AssetElementUtil.java
2009-09-14 11:08:10 UTC (rev 38595)
@@ -337,7 +337,7 @@
* @return
*/
public static boolean isNewFile(FormFile file, NodeManager manager) {
- NodeList assets = getAssetNode(file, manager);
+ NodeList assets = getExistingAssetNode(file, manager);
return (assets.size() == 0);
}
@@ -346,7 +346,7 @@
* @param manager
* @return
*/
- private static NodeList getAssetNode(FormFile file, NodeManager manager) {
+ private static NodeList getExistingAssetNode(FormFile file, NodeManager
manager) {
ChecksumFactory checksumFactory = new ChecksumFactory();
ByteToCharTransformer transformer = (ByteToCharTransformer)
checksumFactory.createTransformer(checksumFactory
.createParameters());
@@ -365,16 +365,16 @@
return assets;
}
- public static String getPathForAsset(FormFile file, NodeManager manager) {
- NodeList assets = getAssetNode(file, manager);
+ public static String getPathForExistingAsset(FormFile file, NodeManager
manager) {
+ NodeList assets = getExistingAssetNode(file, manager);
Node assetNode = assets.get(0);
NodeList channelNodes = assetNode.getRelatedNodes("contentchannel",
"creationrel", "destination");
Node channelNode = channelNodes.get(0);
return RepositoryUtil.getPathToRootString(channelNode);
}
- public static String getTitleFromExsitAsset(FormFile file, NodeManager
manager){
- NodeList assets = getAssetNode(file, manager);
+ public static String getTitleFromExistingAsset(FormFile file, NodeManager
manager){
+ NodeList assets = getExistingAssetNode(file, manager);
Node assetNode = assets.get(0);
return assetNode.getStringValue("title");
}
Modified:
CMSContainer/trunk/CMSContainer/cmsc/contentrepository/src/java/com/finalist/cmsc/repository/forms/AssetUploadAction.java
===================================================================
---
CMSContainer/trunk/CMSContainer/cmsc/contentrepository/src/java/com/finalist/cmsc/repository/forms/AssetUploadAction.java
2009-09-14 11:00:10 UTC (rev 38594)
+++
CMSContainer/trunk/CMSContainer/cmsc/contentrepository/src/java/com/finalist/cmsc/repository/forms/AssetUploadAction.java
2009-09-14 11:08:10 UTC (rev 38595)
@@ -30,10 +30,10 @@
FormFile file = assetUploadForm.getFile();
String big = "";
- String exsit = "";
- String exsitChannel = "";
- String exsitChannelId = "";
- String exsitAssetTitle = "";
+ String existing = "";
+ String existingChannel = "";
+ String existingChannelId = "";
+ String existingAssetTitle = "";
String isZip = "";
List<String> notUploadedFiles = new ArrayList<String>();
List<String> uploadedFiles = new ArrayList<String>();
@@ -59,11 +59,11 @@
AssetElementUtil.addRelationsForNodes(nodes, cloud);
}
} else {
- exsit = "exsit";
- String exsitChannelPath =
AssetElementUtil.getPathForAsset(file, manager);
- exsitChannel = RepositoryUtil.getChannelFromPath(cloud,
exsitChannelPath).getStringValue("name");
- exsitChannelId = RepositoryUtil.getChannelFromPath(cloud,
exsitChannelPath).getStringValue("number");
- exsitAssetTitle =
AssetElementUtil.getTitleFromExsitAsset(file, manager);
+ existing = "existing";
+ String existingChannelPath =
AssetElementUtil.getPathForExistingAsset(file, manager);
+ existingChannel = RepositoryUtil.getChannelFromPath(cloud,
existingChannelPath).getStringValue("name");
+ existingChannelId = RepositoryUtil.getChannelFromPath(cloud,
existingChannelPath).getStringValue("number");
+ existingAssetTitle =
AssetElementUtil.getTitleFromExistingAsset(file, manager);
notUploadedFiles.add(file.getFileName());
}
} else {
@@ -75,12 +75,12 @@
addToSession(request, "notUploadedFiles", notUploadedFiles);
addToSession(request, "uploadedFiles", uploadedFiles);
addToSession(request, "uploadingDone", "yes");
- addToSession(request, "exsitAssetTitle", exsitAssetTitle);
- addToSession(request, "exsitChannel", exsitChannel);
+ addToSession(request, "existingAssetTitle", existingAssetTitle);
+ addToSession(request, "existingChannel", existingChannel);
String url = mapping.findForward(SUCCESS).getPath() +
"?type=asset&direction=down" + "&parentchannel="
+ parentchannel + "&failed=" + notUploadedFiles.size() +
"&uploaded=" + uploadedFiles.size() + "&isZip="
- + isZip + "&big=" + big + "&exsit=" + exsit + "&exsitChannelId=" +
exsitChannelId + "&maxAllowFileSize="
+ + isZip + "&big=" + big + "&existing=" + existing +
"&existingChannelId=" + existingChannelId + "&maxAllowFileSize="
+ BulkUploadUtil.getMaxAllowFileSize() / (1024 * 1024);
return new ActionForward(url, true);
Modified:
CMSContainer/trunk/CMSContainer/cmsc/contentrepository/src/webapp/editors/repository/assetupload.jsp
===================================================================
---
CMSContainer/trunk/CMSContainer/cmsc/contentrepository/src/webapp/editors/repository/assetupload.jsp
2009-09-14 11:00:10 UTC (rev 38594)
+++
CMSContainer/trunk/CMSContainer/cmsc/contentrepository/src/webapp/editors/repository/assetupload.jsp
2009-09-14 11:08:10 UTC (rev 38595)
@@ -44,14 +44,14 @@
<c:if test="${param.big eq 'big'}">
<span style="color:#cc0000"><fmt:message
key="assets.upload.error.big"><fmt:param>${param.maxAllowFileSize}</fmt:param></fmt:message></span>
</c:if>
- <c:if test="${param.exsit eq 'exsit'}">
- <span style="color:#cc0000"><fmt:message
key="assets.upload.error.exsit"/></span><br/>
- <a
href="../repository/Asset.do?type=asset&parentchannel=${param.exsitChannelId}&direction=down">
- ${exsitChannel}
+ <c:if test="${param.existing eq 'existing'}">
+ <span style="color:#cc0000"><fmt:message
key="assets.upload.error.existing"/></span><br/>
+ <a
href="../repository/Asset.do?type=asset&parentchannel=${param.existingChannelId}&direction=down">
+ ${existingChannel}
</a>
- <fmt:message
key="assets.upload.error.exsit.filename"><fmt:param>${exsitAssetTitle}</fmt:param></fmt:message>
- <c:remove var="exsitChannel" scope="session"/>
- <c:remove var="exsitAssetTitle" scope="session"/>
+ <fmt:message
key="assets.upload.error.existing.filename"><fmt:param>${existingAssetTitle}</fmt:param></fmt:message>
+ <c:remove var="existingChannel" scope="session"/>
+ <c:remove var="existingAssetTitle" scope="session"/>
</c:if>
</c:if>
<c:remove var="notUploadedFiles" scope="session"/>
_______________________________________________
Cvs mailing list
Cvs@lists.mmbase.org
http://lists.mmbase.org/mailman/listinfo/cvs
