Bert Leunis pushed to branch bugfix/CMS-11080 at cms-community / hippo-cms
Commits:
71ebf0d4 by Peter Centgraf at 2018-02-16T16:08:52+01:00
CMS-11074 Use new AbstractFileMapper.cleanFilePath() when generating zip file
name for YAML export
- - - - -
9a9c9661 by Bert Leunis at 2018-02-19T10:28:32+01:00
CMS-11080 Merge master changes in bugfix/CMS-11080
- - - - -
2 changed files:
- console/frontend/pom.xml
-
console/frontend/src/main/java/org/hippoecm/frontend/plugins/console/menu/content/DownloadExportYamlLink.java
Changes:
=====================================
console/frontend/pom.xml
=====================================
--- a/console/frontend/pom.xml
+++ b/console/frontend/pom.xml
@@ -36,6 +36,10 @@
</dependency>
<dependency>
<groupId>org.onehippo.cms7</groupId>
+ <artifactId>hippo-cms7-utilities</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.onehippo.cms7</groupId>
<artifactId>hippo-repository-connector</artifactId>
</dependency>
<dependency>
=====================================
console/frontend/src/main/java/org/hippoecm/frontend/plugins/console/menu/content/DownloadExportYamlLink.java
=====================================
---
a/console/frontend/src/main/java/org/hippoecm/frontend/plugins/console/menu/content/DownloadExportYamlLink.java
+++
b/console/frontend/src/main/java/org/hippoecm/frontend/plugins/console/menu/content/DownloadExportYamlLink.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2017 Hippo B.V. (http://www.onehippo.com)
+ * Copyright 2017-2018 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.
@@ -32,6 +32,8 @@ import org.hippoecm.repository.api.NodeNameCodec;
import org.onehippo.cm.ConfigurationService;
import org.onehippo.cms7.services.HippoServiceRegistry;
+import static org.onehippo.cms7.utilities.io.FilePathUtils.cleanFileName;
+
public class DownloadExportYamlLink extends DownloadLink<Node> {
private static final long serialVersionUID = 1L;
@@ -45,7 +47,7 @@ public class DownloadExportYamlLink extends
DownloadLink<Node> {
@Override
protected String getFilename() {
try {
- return NodeNameCodec.decode(getModel().getObject().getName()) +
".zip";
+ return
cleanFileName(NodeNameCodec.decode(getModel().getObject().getName())) + ".zip";
} catch (RepositoryException e) {
error("Unable to get node name for file name, using default");
}
View it on GitLab:
https://code.onehippo.org/cms-community/hippo-cms/compare/dc0702623ee2316fff8414c0d0407cf10d85acbd...9a9c96616f7080e054fa7d3309eba2f4e257abc9
---
View it on GitLab:
https://code.onehippo.org/cms-community/hippo-cms/compare/dc0702623ee2316fff8414c0d0407cf10d85acbd...9a9c96616f7080e054fa7d3309eba2f4e257abc9
You're receiving this email because of your account on code.onehippo.org.
_______________________________________________
Hippocms-svn mailing list
Hippocms-svn@lists.onehippo.org
https://lists.onehippo.org/mailman/listinfo/hippocms-svn
