Jeroen Hoffman pushed to branch release/4.0 at cms-community / hippo-cms

Commits:
c6322d79 by Marijan Milicevic at 2016-10-14T11:20:50+02:00
CMS-10476 Resource field: revision history shows wrong file names
- use own model  and not current one when creating diff

(cherry picked from commit 5ba2405344f701b0c2ae94d3531b1422aaeb7667)

- - - - -
ba32ce60 by Mathijs den Burger at 2016-10-14T11:21:21+02:00
CMS-10476 Bump copyright year

(cherry picked from commit e624549e8de76211a008160178e28b6b8893b98c)

- - - - -
f4c510ed by Jeroen Hoffman at 2016-10-14T11:23:52+02:00
CMS-10476 Reintegrate branch 'bugfix/CMS-10476' into release/4.0

- - - - -


1 changed file:

- 
editor/frontend/src/main/java/org/hippoecm/frontend/editor/plugins/resource/ImageDisplayPlugin.java


Changes:

=====================================
editor/frontend/src/main/java/org/hippoecm/frontend/editor/plugins/resource/ImageDisplayPlugin.java
=====================================
--- 
a/editor/frontend/src/main/java/org/hippoecm/frontend/editor/plugins/resource/ImageDisplayPlugin.java
+++ 
b/editor/frontend/src/main/java/org/hippoecm/frontend/editor/plugins/resource/ImageDisplayPlugin.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2008-2015 Hippo B.V. (http://www.onehippo.com)
+ *  Copyright 2008-2016 Hippo B.V. (http://www.onehippo.com)
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
@@ -108,7 +108,7 @@ public class ImageDisplayPlugin extends RenderPlugin<Node> {
             fragment = new Fragment(id, "embed", this);
             fragment.add(new Label("filesize", 
Model.of(formatter.format(stream.length().bytes()))));
             fragment.add(new Label("mimetype", 
Model.of(stream.getContentType())));
-            fragment.add(createFileLink(stream, getModelObject()));
+            fragment.add(createFileLink(stream, 
stream.getChainedModel().getObject()));
 
             if (stream.getContentType().equals(MIME_TYPE_HIPPO_BLANK)) {
                 fragment.setVisible(false);



View it on GitLab: 
https://code.onehippo.org/cms-community/hippo-cms/compare/f8ca719f51c6f2b624f0369f8cd79c0713e567be...f4c510eda637793f4884181ce7fea83435220f81
_______________________________________________
Hippocms-svn mailing list
Hippocms-svn@lists.onehippo.org
https://lists.onehippo.org/mailman/listinfo/hippocms-svn

Reply via email to