Jeroen Hoffman pushed to branch master at cms-community / hippo-cms
Commits: 6b6c8ffe by Marijan Milicevic at 2016-10-14T13:08:06+02:00 CMS-10477 Resource field: revision history shows wrong file names - use own model and not current one when creating diff (cherry picked from commit 5ba2405344f701b0c2ae94d3531b1422aaeb7667) - - - - - 9d79c8db by Mathijs den Burger at 2016-10-14T13:08:19+02:00 CMS-10477 Bump copyright year (cherry picked from commit e624549e8de76211a008160178e28b6b8893b98c) - - - - - ee7c07fc by Jeroen Hoffman at 2016-10-14T13:10:03+02:00 CMS-10477 Reintegrate local branch 'bugfix/CMS-10477' into master - - - - - 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/b45af2dab439174ea6bf62b8d45bc391098c9ed4...ee7c07fc1087129a94efc488320bf2fa76988c55
_______________________________________________ Hippocms-svn mailing list Hippocms-svn@lists.onehippo.org https://lists.onehippo.org/mailman/listinfo/hippocms-svn
