diff --git a/src/main/java/org/codelibs/fess/app/web/admin/joblog/AdminJoblogAction.java b/src/main/java/org/codelibs/fess/app/web/admin/joblog/AdminJoblogAction.java index 0e6b7a87d..1bb30a0c1 100644 --- a/src/main/java/org/codelibs/fess/app/web/admin/joblog/AdminJoblogAction.java +++ b/src/main/java/org/codelibs/fess/app/web/admin/joblog/AdminJoblogAction.java @@ -15,6 +15,9 @@ */ package org.codelibs.fess.app.web.admin.joblog; +import java.util.ArrayList; +import java.util.List; + import javax.annotation.Resource; import org.codelibs.fess.Constants; @@ -144,6 +147,18 @@ public class AdminJoblogAction extends FessAdminAction { return redirect(getClass()); } + @Execute + public HtmlResponse deleteall() { + verifyToken(() -> asListHtml()); + List jobStatusList = new ArrayList<>(); + jobStatusList.add(Constants.OK); + jobStatusList.add(Constants.FAIL); + jobLogService.deleteByJobStatus(jobStatusList); + jobLogPager.clear(); + saveInfo(messages -> messages.addSuccessJobLogDeleteAll(GLOBAL)); + return redirect(getClass()); + } + // =================================================================================== // Assist Logic // ============ diff --git a/src/main/java/org/codelibs/fess/mylasta/action/FessLabels.java b/src/main/java/org/codelibs/fess/mylasta/action/FessLabels.java index e001e540e..4563a4157 100644 --- a/src/main/java/org/codelibs/fess/mylasta/action/FessLabels.java +++ b/src/main/java/org/codelibs/fess/mylasta/action/FessLabels.java @@ -1641,6 +1641,15 @@ public class FessLabels extends ActionMessages { /** The key of the message: Job Log Details */ public static final String LABELS_joblog_title_details = "{labels.joblog_title_details}"; + /** The key of the message: Delete All */ + public static final String LABELS_joblog_delete_all_link = "{labels.joblog_delete_all_link}"; + + /** The key of the message: Do you really want to delete all? */ + public static final String LABELS_joblog_delete_all_confirmation = "{labels.joblog_delete_all_confirmation}"; + + /** The key of the message: Cancel */ + public static final String LABELS_joblog_delete_all_cancel = "{labels.joblog_delete_all_cancel}"; + /** The key of the message: Dictionary List */ public static final String LABELS_dict_configuration = "{labels.dict_configuration}"; diff --git a/src/main/java/org/codelibs/fess/mylasta/action/FessMessages.java b/src/main/java/org/codelibs/fess/mylasta/action/FessMessages.java index 2494f4da6..44ed9d109 100644 --- a/src/main/java/org/codelibs/fess/mylasta/action/FessMessages.java +++ b/src/main/java/org/codelibs/fess/mylasta/action/FessMessages.java @@ -344,6 +344,9 @@ public class FessMessages extends FessLabels { /** The key of the message: Sent the test mail. */ public static final String SUCCESS_send_testmail = "{success.send_testmail}"; + /** The key of the message: Deleted job logs. */ + public static final String SUCCESS_job_log_delete_all = "{success.job_log_delete_all}"; + /** The key of the message: Created data. */ public static final String SUCCESS_crud_create_crud_table = "{success.crud_create_crud_table}"; @@ -1917,6 +1920,20 @@ public class FessMessages extends FessLabels { return this; } + /** + * Add the created action message for the key 'success.job_log_delete_all' with parameters. + *
+     * message: Deleted job logs.
+     * 
+ * @param property The property name for the message. (NotNull) + * @return this. (NotNull) + */ + public FessMessages addSuccessJobLogDeleteAll(String property) { + assertPropertyNotNull(property); + add(property, new ActionMessage(SUCCESS_job_log_delete_all)); + return this; + } + /** * Add the created action message for the key 'success.crud_create_crud_table' with parameters. *
diff --git a/src/main/resources/fess_label.properties b/src/main/resources/fess_label.properties
index 238ede86f..f5e273e6b 100644
--- a/src/main/resources/fess_label.properties
+++ b/src/main/resources/fess_label.properties
@@ -544,6 +544,9 @@ labels.joblog_scriptType=Executor
 labels.joblog_startTime=Start Time
 labels.joblog_target=Target
 labels.joblog_title_details=Job Log Details
+labels.joblog_delete_all_link=Delete All
+labels.joblog_delete_all_confirmation=Do you really want to delete all?
+labels.joblog_delete_all_cancel=Cancel
 labels.dict_configuration=Dictionary List
 labels.dict_list_title=Dictionary List
 labels.dict_list_link=Dictionaries
diff --git a/src/main/resources/fess_label_en.properties b/src/main/resources/fess_label_en.properties
index 238ede86f..f5e273e6b 100644
--- a/src/main/resources/fess_label_en.properties
+++ b/src/main/resources/fess_label_en.properties
@@ -544,6 +544,9 @@ labels.joblog_scriptType=Executor
 labels.joblog_startTime=Start Time
 labels.joblog_target=Target
 labels.joblog_title_details=Job Log Details
+labels.joblog_delete_all_link=Delete All
+labels.joblog_delete_all_confirmation=Do you really want to delete all?
+labels.joblog_delete_all_cancel=Cancel
 labels.dict_configuration=Dictionary List
 labels.dict_list_title=Dictionary List
 labels.dict_list_link=Dictionaries
diff --git a/src/main/resources/fess_label_ja.properties b/src/main/resources/fess_label_ja.properties
index b7c44e287..3b7aff239 100644
--- a/src/main/resources/fess_label_ja.properties
+++ b/src/main/resources/fess_label_ja.properties
@@ -532,6 +532,9 @@ labels.joblog_scriptType = \u5b9f\u884c\u65b9\u6cd5
 labels.joblog_startTime = \u958b\u59cb\u6642\u9593
 labels.joblog_target = \u5bfe\u8c61
 labels.joblog_title_details = \u30b8\u30e7\u30d6\u30ed\u30b0\u306e\u8a73\u7d30
+labels.joblog_delete_all_link = \u3059\u3079\u3066\u524a\u9664
+labels.joblog_delete_all_confirmation = \u672c\u5f53\u306b\u3059\u3079\u3066\u3092\u524a\u9664\u3057\u307e\u3059\u304b\uff1f
+labels.joblog_delete_all_cancel = \u30ad\u30e3\u30f3\u30bb\u30eb
 labels.dict_configuration = \u8f9e\u66f8\u4e00\u89a7
 labels.dict_list_title = \u8f9e\u66f8\u4e00\u89a7
 labels.dict_list_link = \u8f9e\u66f8
diff --git a/src/main/resources/fess_message.properties b/src/main/resources/fess_message.properties
index 02124b188..275cd58c6 100644
--- a/src/main/resources/fess_message.properties
+++ b/src/main/resources/fess_message.properties
@@ -139,6 +139,7 @@ success.upload_kuromoji_file=Uploaded Kuromoji file.
 success.upload_elevate_word=Uploaded Additional Word file.
 success.upload_bad_word=Uploaded Bad Word file.
 success.send_testmail=Sent the test mail.
+success.job_log_delete_all=Deleted job logs.
 
 success.crud_create_crud_table=Created data.
 success.crud_update_crud_table=Updated data.
diff --git a/src/main/resources/fess_message_en.properties b/src/main/resources/fess_message_en.properties
index 02124b188..275cd58c6 100644
--- a/src/main/resources/fess_message_en.properties
+++ b/src/main/resources/fess_message_en.properties
@@ -139,6 +139,7 @@ success.upload_kuromoji_file=Uploaded Kuromoji file.
 success.upload_elevate_word=Uploaded Additional Word file.
 success.upload_bad_word=Uploaded Bad Word file.
 success.send_testmail=Sent the test mail.
+success.job_log_delete_all=Deleted job logs.
 
 success.crud_create_crud_table=Created data.
 success.crud_update_crud_table=Updated data.
diff --git a/src/main/resources/fess_message_ja.properties b/src/main/resources/fess_message_ja.properties
index dc2d96a80..6f55eda5f 100644
--- a/src/main/resources/fess_message_ja.properties
+++ b/src/main/resources/fess_message_ja.properties
@@ -132,6 +132,8 @@ success.upload_kuromoji_file = Kuromoji\u30d5\u30a1\u30a4\u30eb\u3092\u30a2\u30c
 success.upload_elevate_word = \u8ffd\u52a0\u30ef\u30fc\u30c9\u30d5\u30a1\u30a4\u30eb\u3092\u30a2\u30c3\u30d7\u30ed\u30fc\u30c9\u3057\u307e\u3057\u305f\u3002
 success.upload_bad_word = \u9664\u5916\u30ef\u30fc\u30c9\u30d5\u30a1\u30a4\u30eb\u3092\u30a2\u30c3\u30d7\u30ed\u30fc\u30c9\u3057\u307e\u3057\u305f\u3002
 success.send_testmail=\u30c6\u30b9\u30c8\u30e1\u30fc\u30eb\u3092\u9001\u4fe1\u3057\u307e\u3057\u305f\u3002
+success.job_log_delete_all=\u30b8\u30e7\u30d6\u30ed\u30b0\u3092\u524a\u9664\u3057\u307e\u3057\u305f\u3002
+
 success.crud_create_crud_table = \u30c7\u30fc\u30bf\u3092\u4f5c\u6210\u3057\u307e\u3057\u305f\u3002
 success.crud_update_crud_table = \u30c7\u30fc\u30bf\u3092\u66f4\u65b0\u3057\u307e\u3057\u305f\u3002
 success.crud_delete_crud_table = \u30c7\u30fc\u30bf\u3092\u524a\u9664\u3057\u307e\u3057\u305f\u3002
diff --git a/src/main/webapp/WEB-INF/view/admin/joblog/admin_joblog.jsp b/src/main/webapp/WEB-INF/view/admin/joblog/admin_joblog.jsp
index 105381226..d19e8f8a4 100644
--- a/src/main/webapp/WEB-INF/view/admin/joblog/admin_joblog.jsp
+++ b/src/main/webapp/WEB-INF/view/admin/joblog/admin_joblog.jsp
@@ -105,6 +105,54 @@
 									
 									
 									
+									
+ +
+ +
+ +
+