From c556264eeb03e84b2c03b7731fdd34f7ef7777a2 Mon Sep 17 00:00:00 2001
From: jeb228 <jeb228@440791e1-c2bf-4c1e-ad7c-caf3f8b0ebe8>
Date: Mon, 19 Jul 2010 19:11:30 +0000
Subject: [PATCH] NIHVIVO-862 Distinguish between two different DELETE
 functions: one comes directly from the Individual page, and returns directly
 to it. The other from the "edit" screen and returns to it, while preserving
 the exit page from the transaction for later use.

---
 .../freemarker/ImageUploadController.java     | 39 +++++++++++++------
 1 file changed, 27 insertions(+), 12 deletions(-)

diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/freemarker/ImageUploadController.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/freemarker/ImageUploadController.java
index 87d6947b5..0f654837d 100644
--- a/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/freemarker/ImageUploadController.java
+++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/freemarker/ImageUploadController.java
@@ -64,10 +64,18 @@ public class ImageUploadController extends FreeMarkerHttpServlet {
 	/** The form field of the uploaded file; use as a key to the FileItem map. */
 	public static final String PARAMETER_UPLOADED_FILE = "datafile";
 
-	public static final String ACTION_SAVE = "save";
+	/** Here is the main image file. Hold on to it. */
 	public static final String ACTION_UPLOAD = "upload";
+
+	/** Here is the cropping info; we're ready to save the image. */
+	public static final String ACTION_SAVE = "save";
+
+	/** A request to delete the file and return to the referring page. */
 	public static final String ACTION_DELETE = "delete";
 
+	/** A request to delete the file and return to the "new image" screen. */
+	public static final String ACTION_DELETE_EDIT = "deleteEdit";
+
 	public static final String BODY_TITLE = "title";
 	public static final String BODY_ENTITY_NAME = "entityName";
 	public static final String BODY_MAIN_IMAGE_URL = "imageUrl";
@@ -235,6 +243,8 @@ public class ImageUploadController extends FreeMarkerHttpServlet {
 				return doCreateThumbnail(vreq, entity);
 			} else if (ACTION_DELETE.equals(action)) {
 				return doDeleteImage(vreq, entity);
+			} else if (ACTION_DELETE_EDIT.equals(action)) {
+				return doDeleteThenEdit(vreq, entity);
 			} else {
 				captureReferringUrl(vreq);
 				return doIntroScreen(vreq, entity);
@@ -339,7 +349,8 @@ public class ImageUploadController extends FreeMarkerHttpServlet {
 	}
 
 	/**
-	 * Delete the main image and the thumbnail from the individual.
+	 * Delete the main image and the thumbnail, and go back to the referring
+	 * page.
 	 */
 	private ResponseValues doDeleteImage(VitroRequest vreq, Individual entity) {
 		ImageUploadHelper helper = new ImageUploadHelper(fileStorage, vreq
@@ -350,6 +361,19 @@ public class ImageUploadController extends FreeMarkerHttpServlet {
 		return showExitPage(vreq, entity);
 	}
 
+	/**
+	 * Delete the main image and the thumbnail, and go to the "add image"
+	 * screen.
+	 */
+	private ResponseValues doDeleteThenEdit(VitroRequest vreq, Individual entity) {
+		ImageUploadHelper helper = new ImageUploadHelper(fileStorage, vreq
+				.getFullWebappDaoFactory());
+
+		helper.removeExistingImage(entity);
+
+		return showAddImagePage(vreq, entity);
+	}
+
 	/**
 	 * We need to be talking about an actual Individual here.
 	 */
@@ -401,15 +425,6 @@ public class ImageUploadController extends FreeMarkerHttpServlet {
 		}
 	}
 
-	/**
-	 * Get the URL that will serve this entity's main image, or null.
-	 */
-	private String getMainImageUrl(Individual entity) {
-		String imageUri = FileModelHelper.getMainImageBytestreamUri(entity);
-		String imageFilename = FileModelHelper.getMainImageFilename(entity);
-		return FileServingHelper.getBytestreamAliasUrl(imageUri, imageFilename);
-	}
-
 	/**
 	 * Get the URL that will serve this entity's thumbnail image, or null.
 	 */
@@ -455,7 +470,7 @@ public class ImageUploadController extends FreeMarkerHttpServlet {
 			Individual entity, String thumbUrl) {
 		TemplateResponseValues rv = new TemplateResponseValues(TEMPLATE_REPLACE);
 		rv.put(BODY_THUMBNAIL_URL, UrlBuilder.getUrl(thumbUrl));
-		rv.put(BODY_DELETE_URL, formAction(entity.getURI(), ACTION_DELETE));
+		rv.put(BODY_DELETE_URL, formAction(entity.getURI(), ACTION_DELETE_EDIT));
 		rv.put(BODY_FORM_ACTION, formAction(entity.getURI(), ACTION_UPLOAD));
 		rv.put(BODY_CANCEL_URL, exitPageUrl(vreq, entity.getURI()));
 		rv.put(BODY_TITLE, "Replace image" + forName(entity));