Image Command imageData correctly persisted

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

@@ -78,8 +78,10 @@ public class ImageFormControllerImpl implements ImageFormController {
                                BindingResult bindingResult, Model model) throws IOException {
         logger.debug("ImageFormControllerImpl::saveOrUpdate");
 
-        imageCommand.setFileName(file.getOriginalFilename());
-        imageCommand.setImageData(convertToBase64.convert(file.getBytes()));
+        if (imageCommand.getImageData() == null  || imageCommand.getImageData().isEmpty()) {
+            imageCommand.setFileName(file.getOriginalFilename());
+            imageCommand.setImageData(convertToBase64.convert(file.getBytes()));
+        }
 
         imageCommandValidator.validate(imageCommand, bindingResult);
 

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

@@ -31,10 +31,12 @@
             <tr>
                 <td style="text-align: right;">
                     <label for="id"><span style="color: rgb(255,0,0);">*</span>Database Id :&nbsp;</label>
+                    <label for="imageData"></label>
                 </td>
                 <td style="text-align: left;">
                     <input class="form-control" id="id"
                            th:field="*{id}" type="text" readonly>
+                    <input  class="form-control" th:type = "hidden" id = "imageData" th:field ="*{imageData}" th:value="${imageCommand.imageData}"  >
                 </td>
             </tr>
             <tr>