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

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

Browse source
This commit is contained in:
Shinsuke Sugaya 2015-11-22 10:20:27 +09:00
commit cc78abc682
4 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

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

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

@ -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(name)}">
<la:link styleClass="btn btn-success" href="/admin/scheduler/createnewjob/data_crawling/${f:u(id)}/${f:u(name)}">
<i class="fa fa-plus-circle"></i>
<la:message key="labels.data_crawling_button_create_job" />
</la:link>

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

@ -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(name)}">
<la:link styleClass="btn btn-success" href="/admin/scheduler/createnewjob/file_crawling/${f:u(id)}/${f:u(name)}">
<i class="fa fa-plus-circle"></i>
<la:message key="labels.file_crawling_button_create_job" />
</la:link>

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

@ -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(name)}">
<la:link styleClass="btn btn-success" href="/admin/scheduler/createnewjob/web_crawling/${f:u(id)}/${f:u(name)}">
<i class="fa fa-plus-circle"></i>
<la:message key="labels.web_crawling_button_create_job" />
</la:link>