Merge branch 'master' of https://github.com/codelibs/fess

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

@@ -114,7 +114,7 @@ public class AdminSchedulerAction extends FessAdminAction {
     //                                            ----------
 
     @Execute
-    public HtmlResponse createnewjob(final String type, final String id) {
+    public HtmlResponse createnewjob(final String type, final String name) {
         saveToken();
         return asHtml(path_AdminScheduler_AdminSchedulerEditJsp).useForm(
                 CreateForm.class,
@@ -127,10 +127,10 @@ public class AdminSchedulerAction extends FessAdminAction {
                         scheduledJobForm.available = Constants.ON;
                         scheduledJobForm.name =
                                 ComponentUtil.getMessageManager().getMessage(LaRequestUtil.getRequest().getLocale(),
-                                        "labels." + type + "_job_title", id);
+                                        "labels." + type + "_job_title", name);
                         scheduledJobForm.scriptData =
                                 ComponentUtil.getMessageManager().getMessage(LaRequestUtil.getRequest().getLocale(),
-                                        "labels.scheduledjob_script_template", "\"" + id + "\"", "", "");
+                                        "labels.scheduledjob_script_template", "\"" + name + "\"", "", "");
                     });
                 });
     }

src/main/webapp/WEB-INF/view/admin/dataconfig/admin_dataconfig_details.jsp

@@ -130,7 +130,7 @@
 								<!-- /.box-body -->
 								<div class="box-footer">
 									<jsp:include page="/WEB-INF/view/common/admin/crud/buttons.jsp"></jsp:include>
-									<la:link styleClass="btn btn-success" href="/admin/scheduler/createnewjob/data_crawling/${f:u(id)}">
+									<la:link styleClass="btn btn-success" href="/admin/scheduler/createnewjob/data_crawling/${f:u(name)}">
 										<i class="fa fa-plus-circle"></i>
 										<la:message key="labels.data_crawling_button_create_job" />
 									</la:link>

src/main/webapp/WEB-INF/view/admin/fileconfig/admin_fileconfig_details.jsp

@@ -160,7 +160,7 @@
 								<!-- /.box-body -->
 								<div class="box-footer">
 									<jsp:include page="/WEB-INF/view/common/admin/crud/buttons.jsp"></jsp:include>
-									<la:link styleClass="btn btn-success" href="/admin/scheduler/createnewjob/file_crawling/${f:u(id)}">
+									<la:link styleClass="btn btn-success" href="/admin/scheduler/createnewjob/file_crawling/${f:u(name)}">
 										<i class="fa fa-plus-circle"></i>
 										<la:message key="labels.file_crawling_button_create_job" />
 									</la:link>

src/main/webapp/WEB-INF/view/admin/webconfig/admin_webconfig_details.jsp

@@ -164,7 +164,7 @@
 								<!-- /.box-body -->
 								<div class="box-footer">
 									<jsp:include page="/WEB-INF/view/common/admin/crud/buttons.jsp"></jsp:include>
-									<la:link styleClass="btn btn-success" href="/admin/scheduler/createnewjob/web_crawling/${f:u(id)}">
+									<la:link styleClass="btn btn-success" href="/admin/scheduler/createnewjob/web_crawling/${f:u(name)}">
 										<i class="fa fa-plus-circle"></i>
 										<la:message key="labels.web_crawling_button_create_job" />
 									</la:link>