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

Merge branch 'master' into 10.3.x

Browse source
This commit is contained in:
Shinsuke Sugaya 2016-09-29 18:57:22 +09:00
commit 34524f70ff
5 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/main/java/org/codelibs/fess/app/web/admin/dict/kuromoji/AdminDictKuromojiAction.java
View file

@ -305,8 +305,8 @@ public class AdminDictKuromojiAction extends FessAdminAction {
@Execute
public HtmlResponse delete(final EditForm form) {
verifyCrudMode(form.crudMode, CrudMode.DETAILS, form.dictId);
verifyToken(() -> asDetailsHtml());
validate(form, messages -> {}, () -> asDetailsHtml());
verifyToken(() -> asDetailsHtml());
kuromojiService
.getKuromojiItem(form.dictId, form.id)
.ifPresent(

2
src/main/java/org/codelibs/fess/app/web/admin/dict/mapping/AdminDictMappingAction.java
View file

@ -309,8 +309,8 @@ public class AdminDictMappingAction extends FessAdminAction {
@Execute
public HtmlResponse delete(final EditForm form) {
verifyCrudMode(form.crudMode, CrudMode.DETAILS, form.dictId);
verifyToken(() -> asDetailsHtml());
validate(form, messages -> {}, () -> asDetailsHtml());
verifyToken(() -> asDetailsHtml());
charMappingService
.getCharMappingItem(form.dictId, form.id)
.ifPresent(

2
src/main/java/org/codelibs/fess/app/web/admin/dict/protwords/AdminDictProtwordsAction.java
View file

@ -290,8 +290,8 @@ public class AdminDictProtwordsAction extends FessAdminAction {
@Execute
public HtmlResponse delete(final EditForm form) {
verifyCrudMode(form.crudMode, CrudMode.DETAILS, form.dictId);
verifyToken(() -> asDetailsHtml());
validate(form, messages -> {}, () -> asDetailsHtml());
verifyToken(() -> asDetailsHtml());
protwordsService
.getProtwordsItem(form.dictId, form.id)
.ifPresent(entity -> {

2
src/main/java/org/codelibs/fess/app/web/admin/dict/seunjeon/AdminDictSeunjeonAction.java
View file

@ -293,8 +293,8 @@ public class AdminDictSeunjeonAction extends FessAdminAction {
@Execute
public HtmlResponse delete(final EditForm form) {
verifyCrudMode(form.crudMode, CrudMode.DETAILS, form.dictId);
verifyToken(() -> asDetailsHtml());
validate(form, messages -> {}, () -> asDetailsHtml());
verifyToken(() -> asDetailsHtml());
seunjeonService
.getSeunjeonItem(form.dictId, form.id)
.ifPresent(entity -> {

2
src/main/java/org/codelibs/fess/app/web/admin/dict/synonym/AdminDictSynonymAction.java
View file

@ -309,8 +309,8 @@ public class AdminDictSynonymAction extends FessAdminAction {
@Execute
public HtmlResponse delete(final EditForm form) {
verifyCrudMode(form.crudMode, CrudMode.DETAILS, form.dictId);
verifyToken(() -> asDetailsHtml());
validate(form, messages -> {}, () -> asDetailsHtml());
verifyToken(() -> asDetailsHtml());
synonymService
.getSynonymItem(form.dictId, form.id)
.ifPresent(