Fixes #651 - Use Component#urlFor() to create a url to SummernoteStor…

…edImageResourceReference This requires adding an abstract method to SummernoteEditor to get the storageId
martin-g · Dec 18, 2016 · 67473ba · 67473ba
1 parent 37918a7
commit 67473ba
Show file tree

Hide file tree

Showing 4 changed files with 19 additions and 8 deletions.
diff --git a/.../java/de/agilecoders/wicket/extensions/markup/html/bootstrap/editor/SummernoteEditor.java b/.../java/de/agilecoders/wicket/extensions/markup/html/bootstrap/editor/SummernoteEditor.java
@@ -42,7 +42,7 @@
  * @author Tobias Soloschenko
  *
  */
-public class SummernoteEditor extends FormComponent<String> {
+public abstract class SummernoteEditor extends FormComponent<String> {
 
     private static final long serialVersionUID = 1L;
 
@@ -194,7 +194,9 @@ private Map<String,FileItem> storeFile(AjaxRequestTarget target, MultipartServle
                         SummernoteStorage storage = SummernoteConfig.getStorage(config.getStorageId());
                         storage.writeContent(imageName, fileItem.getInputStream());
                         WebResponse response = (WebResponse) target.getHeaderResponse().getResponse();
-                        response.setHeader("imageUrl", SummernoteStoredImageResourceReference.SUMMERNOTE_MOUNT_PATH
+                        final String storageId = getStorageId();
+                        final CharSequence imageReferenceUrl = urlFor(new SummernoteStoredImageResourceReference(storageId), null);
+                        response.setHeader("imageUrl", imageReferenceUrl
                                                        + "?image=" + Base64.encodeBase64String(imageName.getBytes()));
                         fileItemsMap.put(imageName, fileItem);
                     } catch (IOException e) {
@@ -212,4 +214,8 @@ protected void updateAjaxAttributes(AjaxRequestAttributes attributes) {
         }
     }
 
+    /**
+     * @return The id of the storage used for Summernote image uploads
+     */
+    protected abstract String getStorageId();
 }
diff --git a/...ecoders/wicket/extensions/markup/html/bootstrap/editor/SummernoteStoredImageResource.java b/...ecoders/wicket/extensions/markup/html/bootstrap/editor/SummernoteStoredImageResource.java
@@ -35,6 +35,6 @@ public SummernoteStoredImageResource(String storageId, String imageName) {
      */
     @Override
     protected byte[] getImageData(Attributes attributes) {
-	return SummernoteConfig.getStorage(storageId).getContent(imageName);
+	    return SummernoteConfig.getStorage(storageId).getContent(imageName);
     }
 }
diff --git a/...icket/extensions/markup/html/bootstrap/editor/SummernoteStoredImageResourceReference.java b/...icket/extensions/markup/html/bootstrap/editor/SummernoteStoredImageResourceReference.java
@@ -5,19 +5,19 @@
 import org.apache.wicket.request.cycle.RequestCycle;
 import org.apache.wicket.request.resource.IResource;
 import org.apache.wicket.request.resource.ResourceReference;
+import org.apache.wicket.util.lang.Args;
 import org.apache.wicket.util.string.StringValue;
 
 /**
  * Provides the image data by the given storage id
  *
  * @author Tobias Soloschenko
- *
  */
 public class SummernoteStoredImageResourceReference extends ResourceReference {
 
     private static final long serialVersionUID = 1L;
 
-    public static final String SUMMERNOTE_MOUNT_PATH = "/summernoteimages";
+    public static final String SUMMERNOTE_MOUNT_PATH = "/wicket/bootstrap/summernote/images";
 
     private String storageId;
 
@@ -28,8 +28,8 @@ public class SummernoteStoredImageResourceReference extends ResourceReference {
      *            the id of the file storage
      */
     public SummernoteStoredImageResourceReference(String storageId) {
-        super("summernoteimages");
-        this.storageId = storageId;
+        super("summernote/images/"+storageId);
+        this.storageId = Args.notEmpty(storageId, "storageId");
     }
 
     /**

diff --git a/bootstrap-samples/src/main/java/de/agilecoders/wicket/samples/pages/SummernotePage.java b/bootstrap-samples/src/main/java/de/agilecoders/wicket/samples/pages/SummernotePage.java
@@ -45,7 +45,12 @@ private void addForm(String idSuffix, final boolean isAirMode) {
 
         final IModel<String> summernoteModel = Model.of("Lorem ipsum dolor sit amet, consetetur sadipscing elitr, sed diam nonumy eirmod tempor invidunt ut labore et dolore magna aliquyam erat, sed diam \r\nnvoluptua.");
 
-        final SummernoteEditor summernoteEditor = new SummernoteEditor("summernote" + idSuffix, summernoteModel, summernoteConfig);
+        final SummernoteEditor summernoteEditor = new SummernoteEditor("summernote" + idSuffix, summernoteModel, summernoteConfig) {
+            @Override
+            protected String getStorageId() {
+                return WicketApplication.STORAGE_ID;
+            }
+        };
         form.add(summernoteEditor);
         form.add(new SummernoteAjaxButton("submit" + idSuffix, summernoteEditor) {
             private static final long serialVersionUID = 1L;