From 6363b3fb116cf0dd66419e635cbb9b624b700d6f Mon Sep 17 00:00:00 2001 From: j2blake Date: Fri, 29 Apr 2011 16:23:20 +0000 Subject: [PATCH] NIHVIVO-2570 Max file size is in megabytes to the template --- .../webapp/controller/freemarker/ImageUploadController.java | 4 ++-- 1 file changed, 2 insertions(+), 2 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 943d57eef..16e02ce9e 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 @@ -417,7 +417,7 @@ public class ImageUploadController extends FreemarkerHttpServlet { rv.put(BODY_FORM_ACTION, formAction); rv.put(BODY_CANCEL_URL, cancelUrl); rv.put(BODY_TITLE, "Upload image" + forName(entity)); - rv.put(BODY_MAX_FILE_SIZE, MAXIMUM_FILE_SIZE); + rv.put(BODY_MAX_FILE_SIZE, MAXIMUM_FILE_SIZE / (1024 * 1024)); rv.put(BODY_THUMBNAIL_HEIGHT, THUMBNAIL_HEIGHT); rv.put(BODY_THUMBNAIL_WIDTH, THUMBNAIL_WIDTH); return rv; @@ -444,7 +444,7 @@ public class ImageUploadController extends FreemarkerHttpServlet { rv.put(BODY_FORM_ACTION, formAction(entity.getURI(), ACTION_UPLOAD, placeholderUrl)); rv.put(BODY_CANCEL_URL, exitPageUrl(vreq, entity.getURI())); rv.put(BODY_TITLE, "Replace image" + forName(entity)); - rv.put(BODY_MAX_FILE_SIZE, MAXIMUM_FILE_SIZE); + rv.put(BODY_MAX_FILE_SIZE, MAXIMUM_FILE_SIZE / (1024 * 1024)); rv.put(BODY_THUMBNAIL_HEIGHT, THUMBNAIL_HEIGHT); rv.put(BODY_THUMBNAIL_WIDTH, THUMBNAIL_WIDTH); return rv;