0ct0pu5/fess
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

[WIP] add delete function

Browse source
This commit is contained in:
igarashi 2019-12-02 15:07:28 +09:00
parent be4f9b131d
commit 25339801b0
2 changed files with 64 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
src/main/java/org/codelibs/fess/app/web/admin/storage/AdminStorageAction.java
View file

@ -112,6 +112,22 @@ public class AdminStorageAction extends FessAdminAction {
});
}
@Execute
public HtmlResponse delete(final String id) {
final String[] values = decodeId(id);
if (StringUtil.isEmpty(values[1])) {
throwValidationError(messages -> messages.addErrorsStorageFileNotFound(GLOBAL), () -> asListHtml(values[0]));
}
try {
final MinioClient minioClient = createClient(fessConfig);
minioClient.removeObject(fessConfig.getStorageBucket(), values[0] + values[1]);
} catch (final Exception e) {
logger.debug("Failed to delete {}", values[0] + values[1], e);
// TODO throwValidationError(messages -> messages.addErrorsStorageAccessError(GLOBAL, e.getLocalizedMessage()), () -> asListHtml(values[0]));
}
return redirect(getClass()); // no-op
}
public static List<Map<String, Object>> getFileItems(final String prefix) {
final FessConfig fessConfig = ComponentUtil.getFessConfig();
final ArrayList<Map<String, Object>> list = new ArrayList<>();

50
src/main/webapp/WEB-INF/view/admin/storage/admin_storage.jsp
View file

@ -77,6 +77,7 @@
<td>..</td>
<td></td>
<td></td>
<td></td>
</tr></c:if>
<c:forEach var="data" varStatus="s" items="${fileItems}">
<c:if test="${not data.directory}">
@ -85,15 +86,60 @@
<td>${f:h(data.name)}</td>
<td>${f:h(data.size)}</td>
<td>${f:h(data.lastModifed)}</td>
</tr>
</c:if><c:if test="${data.directory.booleanValue()}">
<tr
data-href="${contextPath}/admin/storage/list/${f:u(data.id)}/">
<td>${f:h(data.name)}</td>
<td></td>
<td></td>
</tr>
</c:if>
<td>
<button type="button" class="btn btn-danger btn-xs" name="delete" data-toggle="modal"
data-target='#confirmToDelete-${f:h(data.id).replace(".", "\\.")}'
value="<la:message key="labels.design_delete_button" />"
>
<em class="fa fa-trash"></em>
<la:message key="labels.design_delete_button" />
</button>
<div class="modal modal-danger fade" id='#confirmToDelete-${f:h(data.id).replace(".", "\\.")}'
tabindex="-1" role="dialog"
>
<div class="modal-dialog">
<div class="modal-content">
<div class="modal-header">
<button type="button" class="close" data-dismiss="modal" aria-label="Close">
<span aria-hidden="true">×</span>
</button>
<h4 class="modal-title">
<la:message key="labels.crud_title_delete" />
</h4>
</div>
<div class="modal-body">
<p>
<la:message key="labels.crud_delete_confirmation" />
</p>
</div>
<div class="modal-footer">
<button type="button" class="btn btn-outline pull-left" data-dismiss="modal">
<la:message key="labels.crud_button_cancel" />
</button>
<button type="button" class="btn btn-outline btn-danger" data-dismiss="modal" data-href="${contextPath}/admin/storage/download/${f:u(data.id)}/">
<la:message key="labels.crud_button_cancel" />
</button>
<la:form action="${contextPath}/admin/storage/delete/${f:u(data.id)}/" styleClass="form-horizontal">
<button type="submit" class="btn btn-outline btn-danger" name="delete"
value="<la:message key="labels.crud_button_delete" />"
>
<em class="fa fa-trash"></em>
<la:message key="labels.crud_button_delete" />
</button>
</la:form>
</div>
</div>
</div>
</div>
</td>
</tr>
</c:forEach>
</tbody>
</table>