Browse Source

modify download

Shinsuke Sugaya 9 years ago
parent
commit
b04227304f

+ 1 - 1
src/main/java/org/codelibs/fess/app/web/admin/log/AdminLogAction.java

@@ -68,7 +68,7 @@ public class AdminLogAction extends FessAdminAction {
         final String logFilePath = systemHelper.getLogFilePath();
         if (StringUtil.isNotBlank(logFilePath)) {
             final Path path = Paths.get(logFilePath, filename);
-            return asStream(filename).contentType("text/plain; charset=UTF-8").stream(out -> {
+            return asStream(filename).stream(out -> {
                 try (InputStream in = Files.newInputStream(path)) {
                     out.write(in);
                 }

+ 3 - 3
src/main/webapp/WEB-INF/view/admin/backup/admin_backup.jsp

@@ -49,9 +49,9 @@
 													</tr>
 													<c:forEach var="data" varStatus="s"
 														items="${backupItems}">
-														<tr>
-															<td><la:link href="download/${f:u(data.id)}"
-																	target="_blank">${f:h(data.name)}</la:link></td>
+														<tr
+															data-href="${contextPath}/admin/backup/download/${f:u(data.id)}/">
+															<td>${f:h(data.name)}</td>
 														</tr>
 													</c:forEach>
 												</tbody>

+ 3 - 3
src/main/webapp/WEB-INF/view/admin/log/admin_log.jsp

@@ -50,9 +50,9 @@
 													</tr>
 													<c:forEach var="logFile" varStatus="s"
 														items="${logFileItems}">
-														<tr>
-															<td><la:link href="download/${f:u(logFile.id)}"
-																	target="_blank">${f:h(logFile.name)}</la:link></td>
+														<tr
+															data-href="${contextPath}/admin/log/download/${f:u(logFile.id)}/">
+															<td>${f:h(logFile.name)}</td>
 															<td><fmt:formatDate value="${logFile.lastModified}"
 																	type="BOTH" dateStyle="MEDIUM" /></td>
 														</tr>