Merge pull request #526 from mozzy11/fix_role

fix Updating image and image display
I-TECH-UW · Aug 25, 2023 · 0fdc36f · 0fdc36f
2 parents 72353c4 + 72a03eb
commit 0fdc36f
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/src/main/java/org/openelisglobal/common/service/servlet/reports/LogoUploadServiceImpl.java b/src/main/java/org/openelisglobal/common/service/servlet/reports/LogoUploadServiceImpl.java
@@ -31,11 +31,12 @@ public void saveImage(Image image, boolean newImage, String imageId, SiteInforma
         if (!newImage) {
             // The reason the old image is deleted and a new one added is because updating
             // the image doesn't work.
+            image.setId(imageId);
         	imageService.delete(image);
         }
-        imageService.save(image);
+        Image savedImage = imageService.save(image);
 
-        logoInformation.setValue(image.getId());
+        logoInformation.setValue(savedImage.getId());
         logoInformation.setSysUserId("1");
         siteInformationService.update(logoInformation);
     }

diff --git a/src/main/webapp/pages/siteinformation/siteInformation.jsp b/src/main/webapp/pages/siteinformation/siteInformation.jsp
@@ -79,7 +79,7 @@
 </c:if>
 <c:if test="${form.valueType == 'logoUpload'}">
 	<input type="hidden" name="logoName" id="logoName" />
-    <img id="imagePreview" src="./dbImage/siteInformation/${form.paramName}.jpg"  
+    <img id="imagePreview" src="./dbImage/siteInformation/${form.paramName}"  
        	 height="42" 
 	     width="42"  />
     <br>