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

fix deleteall

Browse source
This commit is contained in:
Kaoru FUZITA 2015-11-21 03:06:01 +09:00
parent 4154a068d2
commit f1f866bee9
4 changed files with 102 additions and 85 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
src/main/java/org/codelibs/fess/app/web/admin/crawlinginfo/AdminCrawlinginfoAction.java
View file

@ -59,16 +59,9 @@ public class AdminCrawlinginfoAction extends FessAdminAction {
// ===================================================================================
// Search Execute
// ==============
@Execute
public HtmlResponse deleteall(final EditForm form) {
validate(form, messages -> {}, () -> asListHtml());
crawlingSessionService.deleteOldSessions(jobHelper.getRunningSessionIdSet());
saveInfo(messages -> messages.addSuccessCrawlingSessionDeleteAll(GLOBAL));
return redirect(getClass());
}
@Execute
public HtmlResponse index() {
saveToken();
return asListHtml();
}
@ -153,6 +146,15 @@ public class AdminCrawlinginfoAction extends FessAdminAction {
return redirect(getClass());
}
@Execute
public HtmlResponse deleteall() {
verifyToken(() -> asListHtml());
// FIXME:
crawlingSessionService.deleteOldSessions(jobHelper.getRunningSessionIdSet());
saveInfo(messages -> messages.addSuccessCrawlingSessionDeleteAll(GLOBAL));
return redirect(getClass());
}
// ===================================================================================
// Assist Logic
// ============

12
src/main/java/org/codelibs/fess/app/web/admin/failureurl/AdminFailureurlAction.java
View file

@ -58,6 +58,7 @@ public class AdminFailureurlAction extends FessAdminAction {
// ==============
@Execute
public HtmlResponse index() {
saveToken();
return asListHtml();
}
@ -137,11 +138,16 @@ public class AdminFailureurlAction extends FessAdminAction {
}
@Execute
public HtmlResponse deleteall(final EditForm form) {
validate(form, messages -> {}, () -> asListHtml());
public HtmlResponse deleteall() {
verifyToken(() -> asListHtml());
failureUrlService.deleteAll(failureUrlPager);
failureUrlPager.clear();
saveInfo(messages -> messages.addSuccessFailureUrlDeleteAll(GLOBAL));
return redirect(getClass());
return asHtml(path_AdminFailureurl_AdminFailureurlJsp).useForm(SearchForm.class, setup -> {
setup.setup(form -> {
copyBeanToBean(failureUrlPager, form, op -> {});
});
});
}
// ===================================================================================

81
src/main/webapp/WEB-INF/view/admin/crawlinginfo/admin_crawlinginfo.jsp
View file

@ -146,47 +146,52 @@
</div>
</div>
<div class="row">
<div class="col-sm-12 center">
<button type="button" class="btn btn-danger"
data-toggle="modal" data-target="#confirmToDeleteAll">
<i class="fa fa-trash"></i>
<la:message key="labels.crawling_session_delete_all_link" />
</button>
</div>
<div class="modal modal-danger fade" id="confirmToDeleteAll"
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.crawling_session_delete_all_link" />
</h4>
</div>
<div class="modal-body">
<p>
<la:message
key="labels.crawling_session_delete_all_confirmation" />
</p>
</div>
<div class="modal-footer">
<button type="button" class="btn btn-outline pull-left"
data-dismiss="modal">
<la:message
key="labels.crawling_session_delete_all_cancel" />
</button>
<la:link href="deleteall" styleClass="btn btn-outline"
data-dismiss="modal">
<i class="fa fa-trash"></i>
<la:message key="labels.crawling_session_delete_all_link" />
</la:link>
<la:form action="/admin/crawlinginfo/">
<div class="col-sm-12 center">
<button type="button" class="btn btn-danger"
data-toggle="modal" data-target="#confirmToDeleteAll">
<i class="fa fa-trash"></i>
<la:message key="labels.crawling_session_delete_all_link" />
</button>
</div>
<div class="modal modal-danger fade" id="confirmToDeleteAll"
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.crawling_session_delete_all_link" />
</h4>
</div>
<div class="modal-body">
<p>
<la:message
key="labels.crawling_session_delete_all_confirmation" />
</p>
</div>
<div class="modal-footer">
<button type="button" class="btn btn-outline pull-left"
data-dismiss="modal">
<la:message
key="labels.crawling_session_delete_all_cancel" />
</button>
<button type="submit" class="btn btn-outline btn-danger"
name="deleteall"
value="<la:message key="labels.crawling_session_delete_all_link" />">
<i class="fa fa-trash"></i>
<la:message
key="labels.crawling_session_delete_all_link" />
</button>
</div>
</div>
</div>
</div>
</div>
</la:form>
</div>
</c:if>
</div>

76
src/main/webapp/WEB-INF/view/admin/failureurl/admin_failureurl.jsp
View file

@ -163,45 +163,49 @@
</div>
</div>
<div class="row">
<div class="col-sm-12 center">
<button type="button" class="btn btn-danger"
data-toggle="modal" data-target="#confirmToDeleteAll">
<i class="fa fa-trash"></i>
<la:message key="labels.failure_url_delete_all_link" />
</button>
</div>
<div class="modal modal-danger fade" id="confirmToDeleteAll"
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.failure_url_delete_all_link" />
</h4>
</div>
<div class="modal-body">
<p>
<la:message
key="labels.failure_url_delete_all_confirmation" />
</p>
</div>
<div class="modal-footer">
<button type="button" class="btn btn-outline pull-left"
data-dismiss="modal">
<la:message key="labels.failure_url_delete_all_cancel" />
</button>
<la:link href="deleteall" styleClass="btn btn-outline"
data-dismiss="modal">
<la:message key="labels.failure_url_delete_all_link" />
</la:link>
<la:form action="/admin/failureurl/">
<div class="col-sm-12 center">
<button type="button" class="btn btn-danger"
data-toggle="modal" data-target="#confirmToDeleteAll">
<i class="fa fa-trash"></i>
<la:message key="labels.failure_url_delete_all_link" />
</button>
</div>
<div class="modal modal-danger fade" id="confirmToDeleteAll"
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.failure_url_delete_all_link" />
</h4>
</div>
<div class="modal-body">
<p>
<la:message
key="labels.failure_url_delete_all_confirmation" />
</p>
</div>
<div class="modal-footer">
<button type="button" class="btn btn-outline pull-left"
data-dismiss="modal">
<la:message key="labels.failure_url_delete_all_cancel" />
</button>
<button type="submit" class="btn btn-outline btn-danger"
name="deleteall"
value="<la:message key="labels.failure_url_delete_all_link" />">
<i class="fa fa-trash"></i>
<la:message key="labels.failure_url_delete_all_link" />
</button>
</div>
</div>
</div>
</div>
</div>
</la:form>
</div>
</c:if>
</div>