Author: raintang Date: 2009-09-14 09:23:32 +0200 (Mon, 14 Sep 2009) New Revision: 38585
Modified: CMSContainer/branches/b1_6/CMSContainer/cmsc/contentrepository/resources/cmsc-repository.properties CMSContainer/branches/b1_6/CMSContainer/cmsc/contentrepository/resources/cmsc-repository_nl.properties CMSContainer/branches/b1_6/CMSContainer/cmsc/contentrepository/resources/cmsc-repository_zh.properties CMSContainer/branches/b1_6/CMSContainer/cmsc/contentrepository/src/java/com/finalist/cmsc/repository/forms/AssetUploadAction.java CMSContainer/branches/b1_6/CMSContainer/cmsc/contentrepository/src/webapp/editors/repository/assetupload.jsp Log: CMSC-1518 Improved messages for asset upload problems Modified: CMSContainer/branches/b1_6/CMSContainer/cmsc/contentrepository/resources/cmsc-repository.properties =================================================================== --- CMSContainer/branches/b1_6/CMSContainer/cmsc/contentrepository/resources/cmsc-repository.properties 2009-09-14 07:22:47 UTC (rev 38584) +++ CMSContainer/branches/b1_6/CMSContainer/cmsc/contentrepository/resources/cmsc-repository.properties 2009-09-14 07:23:32 UTC (rev 38585) @@ -428,7 +428,7 @@ 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.exsit.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/branches/b1_6/CMSContainer/cmsc/contentrepository/resources/cmsc-repository_nl.properties =================================================================== --- CMSContainer/branches/b1_6/CMSContainer/cmsc/contentrepository/resources/cmsc-repository_nl.properties 2009-09-14 07:22:47 UTC (rev 38584) +++ CMSContainer/branches/b1_6/CMSContainer/cmsc/contentrepository/resources/cmsc-repository_nl.properties 2009-09-14 07:23:32 UTC (rev 38585) @@ -426,7 +426,7 @@ 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.exsit.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=Selecteer een lokaal asset bestand, of een ZIP-bestand dat meerdere assets kan bevatten. Modified: CMSContainer/branches/b1_6/CMSContainer/cmsc/contentrepository/resources/cmsc-repository_zh.properties =================================================================== --- CMSContainer/branches/b1_6/CMSContainer/cmsc/contentrepository/resources/cmsc-repository_zh.properties 2009-09-14 07:22:47 UTC (rev 38584) +++ CMSContainer/branches/b1_6/CMSContainer/cmsc/contentrepository/resources/cmsc-repository_zh.properties 2009-09-14 07:23:32 UTC (rev 38585) @@ -430,7 +430,7 @@ 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.exsit.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/branches/b1_6/CMSContainer/cmsc/contentrepository/src/java/com/finalist/cmsc/repository/forms/AssetUploadAction.java =================================================================== --- CMSContainer/branches/b1_6/CMSContainer/cmsc/contentrepository/src/java/com/finalist/cmsc/repository/forms/AssetUploadAction.java 2009-09-14 07:22:47 UTC (rev 38584) +++ CMSContainer/branches/b1_6/CMSContainer/cmsc/contentrepository/src/java/com/finalist/cmsc/repository/forms/AssetUploadAction.java 2009-09-14 07:23:32 UTC (rev 38585) @@ -60,8 +60,9 @@ } } else { exsit = "exsit"; - exsitChannel = AssetElementUtil.getPathForAsset(file, manager); - exsitChannelId = RepositoryUtil.getChannelFromPath(cloud, exsitChannel).getStringValue("number"); + 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); notUploadedFiles.add(file.getFileName()); } @@ -74,11 +75,13 @@ addToSession(request, "notUploadedFiles", notUploadedFiles); addToSession(request, "uploadedFiles", uploadedFiles); addToSession(request, "uploadingDone", "yes"); + addToSession(request, "exsitAssetTitle", exsitAssetTitle); + addToSession(request, "exsitChannel", exsitChannel); String url = mapping.findForward(SUCCESS).getPath() + "?type=asset&direction=down" + "&parentchannel=" + parentchannel + "&failed=" + notUploadedFiles.size() + "&uploaded=" + uploadedFiles.size() + "&isZip=" - + isZip + "&big=" + big + "&exsit=" + exsit + "&exsitChannel=" + exsitChannel + "&exsitChannelId=" - + exsitChannelId + "&exsitAssetTitle=" + exsitAssetTitle + "&maxAllowFileSize=" + BulkUploadUtil.getMaxAllowFileSize()/(1024*1024); + + isZip + "&big=" + big + "&exsit=" + exsit + "&exsitChannelId=" + exsitChannelId + "&maxAllowFileSize=" + + BulkUploadUtil.getMaxAllowFileSize() / (1024 * 1024); return new ActionForward(url, true); } Modified: CMSContainer/branches/b1_6/CMSContainer/cmsc/contentrepository/src/webapp/editors/repository/assetupload.jsp =================================================================== --- CMSContainer/branches/b1_6/CMSContainer/cmsc/contentrepository/src/webapp/editors/repository/assetupload.jsp 2009-09-14 07:22:47 UTC (rev 38584) +++ CMSContainer/branches/b1_6/CMSContainer/cmsc/contentrepository/src/webapp/editors/repository/assetupload.jsp 2009-09-14 07:23:32 UTC (rev 38585) @@ -47,9 +47,11 @@ <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"> - ${param.exsitChannel} + ${exsitChannel} </a> - <fmt:message key="assets.upload.error.exsit.filename"><fmt:param>${param.exsitAssetTitle}</fmt:param></fmt:message> + <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"/> </c:if> </c:if> <c:remove var="notUploadedFiles" scope="session"/> _______________________________________________ Cvs mailing list Cvs@lists.mmbase.org http://lists.mmbase.org/mailman/listinfo/cvs