Update of
/var/cvs/contributions/CMSContainer/cmsc/edit-webapp/src/webapp/mmbase/edit/wizard/jsp
In directory james.mmbase.org:/tmp/cvs-serv15483/mmbase/edit/wizard/jsp
Modified Files:
upload.jsp
Log Message:
CMSC-1254 Assets: Error when trying to upload an attachment, via a
contentelement.
See also:
http://cvs.mmbase.org/viewcvs/contributions/CMSContainer/cmsc/edit-webapp/src/webapp/mmbase/edit/wizard/jsp
See also: http://www.mmbase.org/jira/browse/CMSC-1254
Index: upload.jsp
===================================================================
RCS file:
/var/cvs/contributions/CMSContainer/cmsc/edit-webapp/src/webapp/mmbase/edit/wizard/jsp/upload.jsp,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -b -r1.4 -r1.5
--- upload.jsp 15 Jan 2009 04:55:19 -0000 1.4
+++ upload.jsp 2 Feb 2009 06:21:24 -0000 1.5
@@ -30,17 +30,19 @@
<title><fmt:message key="upload.title" /></title>
<link rel="stylesheet" type="text/css" href="../../../../editors/css/main.css"
/>
<script type="text/javascript">
- function upload() {
+ function upload( filetype ) {
//validate file type
var file = document.getElementById("file");
var i=file.value.lastIndexOf(".");
var ext=file.value.substring(i);
var ext1=ext.toLowerCase();
+ if(filetype == "image"){//CMSC-1254
if(ext1!=".gif" && ext1!=".jpg" &&
ext1!=".jpeg"&&ext1!=".tiff"&&ext1!=".tif"&&ext1!=".bmp"&&ext1!=".svg"&&ext1!=".png")
{
alert('<fmt:message key="asset.notimage.warning" />');
return false;
}
+ }
var f=document.forms[0];
f.submit();
@@ -81,7 +83,7 @@
<p>
<form action="<mm:url page="processuploads.jsp"
/>?did=<%=did%>&proceed=true&popupid=<%=popupId%>&sessionkey=<%=ewconfig.sessionKey%>&wizard=<%=wizard%>&maxsize=<%=maxsize%>"
enctype="multipart/form-data" method="POST" >
<input type="file" name="<%=did%>" id="file"></input><br />
- <input type="button" onclick="upload();"
value="<fmt:message key="upload.button.upload" />"></input><br />
+ <input type="button" onclick="upload('${param.filetype}');"
value="<fmt:message key="upload.button.upload" />"></input><br />
</form>
</p>
</div>
_______________________________________________
Cvs mailing list
[email protected]
http://lists.mmbase.org/mailman/listinfo/cvs
