details: https://code.openbravo.com/erp/devel/pi/rev/1cdcecb3a2eb changeset: 13396:1cdcecb3a2eb user: Antonio Moreno <antonio.moreno <at> openbravo.com> date: Wed Aug 03 11:32:19 2011 +0200 summary: [imageBLOB] Added admin moe in ShowImageLogo
details: https://code.openbravo.com/erp/devel/pi/rev/41953ef25f69 changeset: 13397:41953ef25f69 user: Antonio Moreno <antonio.moreno <at> openbravo.com> date: Wed Aug 03 11:32:50 2011 +0200 summary: [imageBLOB] Use admin mode only when necessary diffstat: modules/org.openbravo.client.application/src/org/openbravo/client/application/window/ImagesActionHandler.java | 14 +- src/org/openbravo/erpCommon/utility/ShowImageLogo.java | 52 +++++---- 2 files changed, 36 insertions(+), 30 deletions(-) diffs (100 lines): diff -r 54fe214425b7 -r 41953ef25f69 modules/org.openbravo.client.application/src/org/openbravo/client/application/window/ImagesActionHandler.java --- a/modules/org.openbravo.client.application/src/org/openbravo/client/application/window/ImagesActionHandler.java Wed Aug 03 11:06:32 2011 +0200 +++ b/modules/org.openbravo.client.application/src/org/openbravo/client/application/window/ImagesActionHandler.java Wed Aug 03 11:32:50 2011 +0200 @@ -60,19 +60,19 @@ try { Tab tab = OBDal.getInstance().get(Tab.class, tabId); table = tab.getTable(); - String columnName = (String) parameters.get("inpColumnName"); - String parentObjectId = (String) parameters.get("parentObjectId"); Image image = OBDal.getInstance().get(Image.class, imageID); - Entity entity = ModelProvider.getInstance().getEntityByTableName(table.getDBTableName()); - String propertyName = entity.getPropertyByColumnName(columnName).getName(); - BaseOBObject parentObject = (BaseOBObject) OBDal.getInstance().get(entity.getName(), - parentObjectId); - parentObject.set(propertyName, null); OBDal.getInstance().flush(); OBDal.getInstance().remove(image); } finally { OBContext.restorePreviousMode(); } + String columnName = (String) parameters.get("inpColumnName"); + String parentObjectId = (String) parameters.get("parentObjectId"); + Entity entity = ModelProvider.getInstance().getEntityByTableName(table.getDBTableName()); + String propertyName = entity.getPropertyByColumnName(columnName).getName(); + BaseOBObject parentObject = (BaseOBObject) OBDal.getInstance().get(entity.getName(), + parentObjectId); + parentObject.set(propertyName, null); return new JSONObject(); } else if (parameters.get("command").equals("GETSIZE")) { try { diff -r 54fe214425b7 -r 41953ef25f69 src/org/openbravo/erpCommon/utility/ShowImageLogo.java --- a/src/org/openbravo/erpCommon/utility/ShowImageLogo.java Wed Aug 03 11:06:32 2011 +0200 +++ b/src/org/openbravo/erpCommon/utility/ShowImageLogo.java Wed Aug 03 11:32:50 2011 +0200 @@ -30,6 +30,7 @@ import org.openbravo.base.HttpBaseServlet; import org.openbravo.base.secureApp.VariablesSecureApp; +import org.openbravo.dal.core.OBContext; import org.openbravo.dal.service.OBDal; import org.openbravo.model.ad.utility.Image; @@ -56,30 +57,35 @@ // read the image data byte[] img; String mimeType = null; - Image image = Utility.getImageLogoObject(logo, org); - if (image != null) { - img = image.getBindaryData(); - mimeType = image.getMimetype(); - } else { - img = Utility.getImageLogo(logo, org); + try { + OBContext.setAdminMode(false); + Image image = Utility.getImageLogoObject(logo, org); + if (image != null) { + img = image.getBindaryData(); + mimeType = image.getMimetype(); + } else { + img = Utility.getImageLogo(logo, org); + } + // write the mimetype + if (mimeType == null) { + mimeType = MimeTypeUtil.getInstance().getMimeTypeName(img); + if (image != null) { + // If there is an OBContext, we attempt to save the MIME type of the image + updateMimeType(image.getId(), mimeType); + } + } + if (!mimeType.equals("")) { + response.setContentType(mimeType); + } + + // write the image + OutputStream out = response.getOutputStream(); + response.setContentLength(img.length); + out.write(img); + out.close(); + } finally { + OBContext.restorePreviousMode(); } - // write the mimetype - if (mimeType == null) { - mimeType = MimeTypeUtil.getInstance().getMimeTypeName(img); - if (image != null) { - // If there is an OBContext, we attempt to save the MIME type of the image - updateMimeType(image.getId(), mimeType); - } - } - if (!mimeType.equals("")) { - response.setContentType(mimeType); - } - - // write the image - OutputStream out = response.getOutputStream(); - response.setContentLength(img.length); - out.write(img); - out.close(); } /** ------------------------------------------------------------------------------ BlackBerry® DevCon Americas, Oct. 18-20, San Francisco, CA The must-attend event for mobile developers. Connect with experts. Get tools for creating Super Apps. See the latest technologies. Sessions, hands-on labs, demos & much more. Register early & save! http://p.sf.net/sfu/rim-blackberry-1 _______________________________________________ Openbravo-commits mailing list [email protected] https://lists.sourceforge.net/lists/listinfo/openbravo-commits
