Browse Source

rename to schedulerPager

Shinsuke Sugaya 9 years ago
parent
commit
1ffc0b63f2

+ 9 - 9
src/main/java/org/codelibs/fess/app/web/admin/scheduler/AdminSchedulerAction.java

@@ -48,7 +48,7 @@ public class AdminSchedulerAction extends FessAdminAction {
     @Resource
     private ScheduledJobService scheduledJobService;
     @Resource
-    private SchedulerPager scheduledJobPager;
+    private SchedulerPager schedulerPager;
     @Resource
     private SystemHelper systemHelper;
     @Resource
@@ -74,9 +74,9 @@ public class AdminSchedulerAction extends FessAdminAction {
     @Execute
     public HtmlResponse list(final OptionalThing<Integer> pageNumber, final SearchForm form) {
         pageNumber.ifPresent(num -> {
-            scheduledJobPager.setCurrentPageNumber(pageNumber.get());
+            schedulerPager.setCurrentPageNumber(pageNumber.get());
         }).orElse(() -> {
-            scheduledJobPager.setCurrentPageNumber(0);
+            schedulerPager.setCurrentPageNumber(0);
         });
         return asHtml(path_AdminScheduler_AdminSchedulerJsp).renderWith(data -> {
             searchPaging(data, form);
@@ -85,7 +85,7 @@ public class AdminSchedulerAction extends FessAdminAction {
 
     @Execute
     public HtmlResponse search(final SearchForm form) {
-        copyBeanToBean(form, scheduledJobPager, op -> op.exclude(Constants.PAGER_CONVERSION_RULE));
+        copyBeanToBean(form, schedulerPager, op -> op.exclude(Constants.PAGER_CONVERSION_RULE));
         return asHtml(path_AdminScheduler_AdminSchedulerJsp).renderWith(data -> {
             searchPaging(data, form);
         });
@@ -93,17 +93,17 @@ public class AdminSchedulerAction extends FessAdminAction {
 
     @Execute
     public HtmlResponse reset(final SearchForm form) {
-        scheduledJobPager.clear();
+        schedulerPager.clear();
         return asHtml(path_AdminScheduler_AdminSchedulerJsp).renderWith(data -> {
             searchPaging(data, form);
         });
     }
 
     protected void searchPaging(final RenderData data, final SearchForm form) {
-        data.register("scheduledJobItems", scheduledJobService.getScheduledJobList(scheduledJobPager)); // page navi
+        data.register("scheduledJobItems", scheduledJobService.getScheduledJobList(schedulerPager)); // page navi
 
         // restore from pager
-        copyBeanToBean(scheduledJobPager, form, op -> op.include("id"));
+        copyBeanToBean(schedulerPager, form, op -> op.include("id"));
     }
 
     // ===================================================================================
@@ -353,10 +353,10 @@ public class AdminSchedulerAction extends FessAdminAction {
 
     private HtmlResponse asListHtml() {
         return asHtml(path_AdminScheduler_AdminSchedulerJsp).renderWith(data -> {
-            data.register("scheduledJobItems", scheduledJobService.getScheduledJobList(scheduledJobPager)); // page navi
+            data.register("scheduledJobItems", scheduledJobService.getScheduledJobList(schedulerPager)); // page navi
             }).useForm(SearchForm.class, setup -> {
             setup.setup(form -> {
-                copyBeanToBean(scheduledJobPager, form, op -> op.include("id"));
+                copyBeanToBean(schedulerPager, form, op -> op.include("id"));
             });
         });
     }

+ 3 - 3
src/main/webapp/WEB-INF/view/admin/scheduler/admin_scheduler.jsp

@@ -37,7 +37,7 @@
 									<la:errors />
 								</div>
 								<%-- List --%>
-								<c:if test="${scheduledJobPager.allRecordCount == 0}">
+								<c:if test="${schedulerPager.allRecordCount == 0}">
 									<div class="row top10">
 										<div class="col-sm-12">
 											<i class="fa fa-info-circle text-light-blue"></i>
@@ -45,7 +45,7 @@
 										</div>
 									</div>
 								</c:if>
-								<c:if test="${scheduledJobPager.allRecordCount > 0}">
+								<c:if test="${schedulerPager.allRecordCount > 0}">
 									<div class="row">
 										<div class="col-sm-12">
 											<table class="table table-bordered table-striped">
@@ -82,7 +82,7 @@
 											</table>
 										</div>
 									</div>
-									<c:set var="pager" value="${scheduledJobPager}" scope="request" />
+									<c:set var="pager" value="${schedulerPager}" scope="request" />
 									<c:import url="/WEB-INF/view/common/admin/crud/pagination.jsp" />
 								</c:if>
 							</div>