Images: display image on Form Page (6)

src/main/java/scot/carricksoftware/grants/controllers/images/images/ImageFormControllerImpl.java

@@ -89,7 +89,6 @@ public class ImageFormControllerImpl implements ImageFormController {
 
         ImageCommand savedCommand = imageService.saveImageCommand(imageCommand);
         model.addAttribute(ImageAttributeConstants.IMAGE_COMMAND, savedCommand);
-        model.addAttribute("image", savedCommand.getImageData());
         return MappingConstants.REDIRECT + ImageMappingConstants.IMAGE_SHOW.replace("{id}", "" + savedCommand.getId());
     }
 
@@ -99,11 +98,6 @@ public class ImageFormControllerImpl implements ImageFormController {
     public String showById(@PathVariable String id, Model model) {
         logger.debug("ImageFormControllerImpl::saveOrUpdate");
         ImageCommand savedCommand = imageConverter.convert(imageService.findById(Long.valueOf(id)));
-        if (savedCommand != null) {
-            model.addAttribute("image", savedCommand.getImageData());
-        } else {
-            model.addAttribute("image", null);
-        }
         model.addAttribute(ImageAttributeConstants.IMAGE_COMMAND, savedCommand);
         return ViewConstants.IMAGE_FORM;
     }

src/main/resources/templates/images/image/form.html

@@ -78,7 +78,7 @@
             </tr>
             </table>
 
-            <div th:if="${image != null and !#strings.isEmpty(image)}">
+            <div th:if="${imageCommand.imageData != null and !#strings.isEmpty(imageCommand.imageData)}">
                         <img class='img-thumbnail' th:src="'data:image/jpeg;base64,' + ${imageCommand.imageData} "
                              width="250" height="250" alt =""/>
             </div>