From e50507efee7af59e45ccef2bea0cb9387540c265 Mon Sep 17 00:00:00 2001
From: mb863 <mb863@440791e1-c2bf-4c1e-ad7c-caf3f8b0ebe8>
Date: Thu, 1 Jul 2010 19:10:34 +0000
Subject: [PATCH] added validation for uploading a photo. Users must select a
 photo before they hit the upload button.

---
 webapp/web/js/imageUpload/validateUpload.js   | 21 +++++++++++++++++++
 .../freemarker/body/imageUpload/newImage.ftl  |  4 +++-
 2 files changed, 24 insertions(+), 1 deletion(-)
 create mode 100644 webapp/web/js/imageUpload/validateUpload.js

diff --git a/webapp/web/js/imageUpload/validateUpload.js b/webapp/web/js/imageUpload/validateUpload.js
new file mode 100644
index 000000000..33668ccc5
--- /dev/null
+++ b/webapp/web/js/imageUpload/validateUpload.js
@@ -0,0 +1,21 @@
+function validate_upload_file(form_passed)  {
+	
+	var msg="";
+
+	if (form_passed.datafile.value == "") msg += "Please browse and select a photo\n";
+
+	
+	if (msg == "") {
+
+		document.form_upload_image.submit();
+		
+		
+	} else{
+		
+		alert(msg);
+		return false;
+		
+		}
+
+	
+}
\ No newline at end of file
diff --git a/webapp/web/templates/freemarker/body/imageUpload/newImage.ftl b/webapp/web/templates/freemarker/body/imageUpload/newImage.ftl
index 248422cce..8bffeddb0 100644
--- a/webapp/web/templates/freemarker/body/imageUpload/newImage.ftl
+++ b/webapp/web/templates/freemarker/body/imageUpload/newImage.ftl
@@ -2,6 +2,8 @@
 
 <#-- Upload a replacement main image for an Individual. -->
 
+${scripts.add("/js/imageUpload/validateUpload.js")}
+
 ${stylesheets.addFromTheme("/uploadImages.css")}
 
 <#if errorMessage??>
@@ -14,7 +16,7 @@ ${stylesheets.addFromTheme("/uploadImages.css")}
               <h6>Current Photo</h6>
               <img src="${thumbnailUrl}" width="115" height="115" /> </div>
        <div id="photoUploadForm">
-              <form action="${formAction}" enctype="multipart/form-data" method="post">
+              <form action="${formAction}" enctype="multipart/form-data" method="post" onSubmit="return validate_upload_file(this)">
                      <label>Upload a photo <span> (JPEG, GIF or PNG. Max Size: 50 MB)</span></label>
                      <input type="file" name="datafile" size="30">
                      <input type="submit" value="Upload photo"> or <a href="${cancelUrl}">Cancel</a>