litvinovg/vitro
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

NIHVIVO-161 - If the user cancels the process, return them to the page they were viewing when they started.

Browse source
This commit is contained in:
jeb228 2010-07-13 15:23:28 +00:00
parent dbd0346c0d
commit 0b02cc5fbb
1 changed files with 59 additions and 30 deletions
Download patch file Download diff file Expand all files Collapse all files

89
webapp/src/edu/cornell/mannlib/vitro/webapp/controller/freemarker/ImageUploadController.java
View file

@ -40,6 +40,8 @@ public class ImageUploadController extends FreeMarkerHttpServlet {
private static final Log log = LogFactory private static final Log log = LogFactory
.getLog(ImageUploadController.class); .getLog(ImageUploadController.class);
private static final String ATTRIBUTE_REFERRING_PAGE = "ImageUploadController.referringPage";
private static final String DEFAULT_NAMESPACE = ConfigurationProperties private static final String DEFAULT_NAMESPACE = ConfigurationProperties
.getProperty("Vitro.defaultNamespace"); .getProperty("Vitro.defaultNamespace");
@ -224,28 +226,43 @@ public class ImageUploadController extends FreeMarkerHttpServlet {
} else if (ACTION_SAVE.equals(action)) { } else if (ACTION_SAVE.equals(action)) {
return doCreateThumbnail(vreq, entity); return doCreateThumbnail(vreq, entity);
} else if (ACTION_DELETE.equals(action)) { } else if (ACTION_DELETE.equals(action)) {
return doDeleteImage(entity); return doDeleteImage(vreq, entity);
} else { } else {
return doIntroScreen(entity); captureReferringUrl(vreq);
return doIntroScreen(vreq, entity);
} }
} catch (UserMistakeException e) { } catch (UserMistakeException e) {
// Can't find the entity? Complain. // Can't find the entity? Complain.
return showAddImagePageWithError(null, e.getMessage()); return showAddImagePageWithError(vreq, null, e.getMessage());
} catch (Exception e) { } catch (Exception e) {
// We weren't expecting this - log it, and apologize to the user. // We weren't expecting this - log it, and apologize to the user.
return new ExceptionResponseValues(e); return new ExceptionResponseValues(e);
} }
} }
/**
* We are just starting the upload process. Record where we came from, so if
* they hit "cancel" we know where to send them. If we have problems, just
* clear it.
*/
private void captureReferringUrl(VitroRequest vreq) {
String referrer = vreq.getHeader("Referer");
if (referrer == null) {
vreq.getSession().removeAttribute(ATTRIBUTE_REFERRING_PAGE);
} else {
vreq.getSession().setAttribute(ATTRIBUTE_REFERRING_PAGE, referrer);
}
}
/** /**
* Show the first screen in the upload process: Add or Replace. * Show the first screen in the upload process: Add or Replace.
*/ */
private ResponseValues doIntroScreen(Individual entity) { private ResponseValues doIntroScreen(VitroRequest vreq, Individual entity) {
String thumbUrl = getThumbnailUrl(entity); String thumbUrl = getThumbnailUrl(entity);
if (thumbUrl == null) { if (thumbUrl == null) {
return showAddImagePage(entity); return showAddImagePage(vreq, entity);
} else { } else {
return showReplaceImagePage(entity, thumbUrl); return showReplaceImagePage(vreq, entity, thumbUrl);
} }
} }
@ -265,9 +282,10 @@ public class ImageUploadController extends FreeMarkerHttpServlet {
String thumbUrl = getThumbnailUrl(entity); String thumbUrl = getThumbnailUrl(entity);
String message = e.getMessage(); String message = e.getMessage();
if (thumbUrl == null) { if (thumbUrl == null) {
return showAddImagePageWithError(entity, message); return showAddImagePageWithError(vreq, entity, message);
} else { } else {
return showReplaceImagePageWithError(entity, thumbUrl, message); return showReplaceImagePageWithError(vreq, entity, thumbUrl,
message);
} }
} }
@ -283,7 +301,8 @@ public class ImageUploadController extends FreeMarkerHttpServlet {
Dimensions mainImageSize = helper.getMainImageSize(entity); Dimensions mainImageSize = helper.getMainImageSize(entity);
// Go to the cropping page. // Go to the cropping page.
return showCropImagePage(entity, getMainImageUrl(entity), mainImageSize); return showCropImagePage(vreq, entity, getMainImageUrl(entity),
mainImageSize);
} }
/** /**
@ -301,19 +320,19 @@ public class ImageUploadController extends FreeMarkerHttpServlet {
helper.removeExistingThumbnail(entity); helper.removeExistingThumbnail(entity);
helper.generateThumbnailAndStore(entity, crop); helper.generateThumbnailAndStore(entity, crop);
return showIndividualDisplayPage(entity); return showExitPage(vreq, entity);
} }
/** /**
* Delete the main image and the thumbnail from the individual. * Delete the main image and the thumbnail from the individual.
*/ */
private ResponseValues doDeleteImage(Individual entity) { private ResponseValues doDeleteImage(VitroRequest vreq, Individual entity) {
ImageUploadHelper helper = new ImageUploadHelper(fileStorage, ImageUploadHelper helper = new ImageUploadHelper(fileStorage,
getWebappDaoFactory()); getWebappDaoFactory());
helper.removeExistingImage(entity); helper.removeExistingImage(entity);
return showIndividualDisplayPage(entity); return showExitPage(vreq, entity);
} }
/** /**
@ -402,10 +421,11 @@ public class ImageUploadController extends FreeMarkerHttpServlet {
* @param entity * @param entity
* if this is null, then all URLs lead to the welcome page. * if this is null, then all URLs lead to the welcome page.
*/ */
private TemplateResponseValues showAddImagePage(Individual entity) { private TemplateResponseValues showAddImagePage(VitroRequest vreq,
Individual entity) {
String formAction = (entity == null) ? "" : formAction(entity.getURI(), String formAction = (entity == null) ? "" : formAction(entity.getURI(),
ACTION_UPLOAD); ACTION_UPLOAD);
String cancelUrl = (entity == null) ? "" : displayPageUrl(entity String cancelUrl = (entity == null) ? "" : exitPageUrl(vreq, entity
.getURI()); .getURI());
TemplateResponseValues rv = new TemplateResponseValues(TEMPLATE_NEW); TemplateResponseValues rv = new TemplateResponseValues(TEMPLATE_NEW);
@ -419,21 +439,21 @@ public class ImageUploadController extends FreeMarkerHttpServlet {
/** /**
* The individual has no image, but the user did something wrong. * The individual has no image, but the user did something wrong.
*/ */
private TemplateResponseValues showAddImagePageWithError(Individual entity, private TemplateResponseValues showAddImagePageWithError(VitroRequest vreq,
String message) { Individual entity, String message) {
return showAddImagePage(entity).put(BODY_ERROR_MESSAGE, message); return showAddImagePage(vreq, entity).put(BODY_ERROR_MESSAGE, message);
} }
/** /**
* The individual has an image - go to the Replace Image page. * The individual has an image - go to the Replace Image page.
*/ */
private TemplateResponseValues showReplaceImagePage(Individual entity, private TemplateResponseValues showReplaceImagePage(VitroRequest vreq,
String thumbUrl) { Individual entity, String thumbUrl) {
TemplateResponseValues rv = new TemplateResponseValues(TEMPLATE_REPLACE); TemplateResponseValues rv = new TemplateResponseValues(TEMPLATE_REPLACE);
rv.put(BODY_THUMBNAIL_URL, UrlBuilder.getUrl(thumbUrl)); 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));
rv.put(BODY_FORM_ACTION, formAction(entity.getURI(), ACTION_UPLOAD)); rv.put(BODY_FORM_ACTION, formAction(entity.getURI(), ACTION_UPLOAD));
rv.put(BODY_CANCEL_URL, displayPageUrl(entity.getURI())); rv.put(BODY_CANCEL_URL, exitPageUrl(vreq, entity.getURI()));
rv.put(BODY_TITLE, "Replace image" + forName(entity)); rv.put(BODY_TITLE, "Replace image" + forName(entity));
return rv; return rv;
} }
@ -442,8 +462,9 @@ public class ImageUploadController extends FreeMarkerHttpServlet {
* The individual has an image, but the user did something wrong. * The individual has an image, but the user did something wrong.
*/ */
private TemplateResponseValues showReplaceImagePageWithError( private TemplateResponseValues showReplaceImagePageWithError(
Individual entity, String thumbUrl, String message) { VitroRequest vreq, Individual entity, String thumbUrl,
TemplateResponseValues rv = showReplaceImagePage(entity, thumbUrl); String message) {
TemplateResponseValues rv = showReplaceImagePage(vreq, entity, thumbUrl);
rv.put(BODY_ERROR_MESSAGE, message); rv.put(BODY_ERROR_MESSAGE, message);
return rv; return rv;
} }
@ -451,14 +472,14 @@ public class ImageUploadController extends FreeMarkerHttpServlet {
/** /**
* We got their main image - go to the Crop Image page. * We got their main image - go to the Crop Image page.
*/ */
private TemplateResponseValues showCropImagePage(Individual entity, private TemplateResponseValues showCropImagePage(VitroRequest vreq,
String imageUrl, Dimensions dimensions) { Individual entity, String imageUrl, Dimensions dimensions) {
TemplateResponseValues rv = new TemplateResponseValues(TEMPLATE_CROP); TemplateResponseValues rv = new TemplateResponseValues(TEMPLATE_CROP);
rv.put(BODY_MAIN_IMAGE_URL, UrlBuilder.getUrl(imageUrl)); rv.put(BODY_MAIN_IMAGE_URL, UrlBuilder.getUrl(imageUrl));
rv.put(BODY_MAIN_IMAGE_HEIGHT, dimensions.height); rv.put(BODY_MAIN_IMAGE_HEIGHT, dimensions.height);
rv.put(BODY_MAIN_IMAGE_WIDTH, dimensions.width); rv.put(BODY_MAIN_IMAGE_WIDTH, dimensions.width);
rv.put(BODY_FORM_ACTION, formAction(entity.getURI(), ACTION_SAVE)); rv.put(BODY_FORM_ACTION, formAction(entity.getURI(), ACTION_SAVE));
rv.put(BODY_CANCEL_URL, displayPageUrl(entity.getURI())); rv.put(BODY_CANCEL_URL, exitPageUrl(vreq, entity.getURI()));
rv.put(BODY_TITLE, "Crop Photo" + forName(entity)); rv.put(BODY_TITLE, "Crop Photo" + forName(entity));
return rv; return rv;
} }
@ -466,15 +487,23 @@ public class ImageUploadController extends FreeMarkerHttpServlet {
/** /**
* All done - go to the individual display page. * All done - go to the individual display page.
*/ */
private ForwardResponseValues showIndividualDisplayPage(Individual entity) { private ForwardResponseValues showExitPage(VitroRequest vreq,
return new ForwardResponseValues(displayPageUrl(entity.getURI())); Individual entity) {
return new ForwardResponseValues(exitPageUrl(vreq, entity.getURI()));
} }
/** /**
* When we complete the process, by success or by cancellation, we go to the * When we complete the process, by success or by cancellation, go to the
* individual display page. * initial referring page. If there wasn't one, go to the individual display
* page,
*/ */
private String displayPageUrl(String entityUri) { private String exitPageUrl(VitroRequest vreq, String entityUri) {
String referrer = (String) vreq.getSession().getAttribute(
ATTRIBUTE_REFERRING_PAGE);
if (referrer != null) {
return referrer;
}
if (DEFAULT_NAMESPACE == null) { if (DEFAULT_NAMESPACE == null) {
return ""; return "";
} else if (!entityUri.startsWith(DEFAULT_NAMESPACE)) { } else if (!entityUri.startsWith(DEFAULT_NAMESPACE)) {