Browse Source

modify redirect url and crudMode

Shinsuke Sugaya 9 years ago
parent
commit
9860aa827f

+ 4 - 4
src/main/java/org/codelibs/fess/app/web/admin/dict/kuromoji/AdminDictKuromojiAction.java

@@ -283,7 +283,7 @@ public class AdminDictKuromojiAction extends FessAdminAction {
     @Execute
     @Execute
     public HtmlResponse upload(final UploadForm form) {
     public HtmlResponse upload(final UploadForm form) {
         // TODO
         // TODO
-        return redirect(getClass());
+        return redirectWith(getClass(), moreUrl("list/1").params("dictId", form.dictId));
     }
     }
 
 
     // -----------------------------------------------------
     // -----------------------------------------------------
@@ -304,7 +304,7 @@ public class AdminDictKuromojiAction extends FessAdminAction {
         }).orElse(() -> {
         }).orElse(() -> {
             throwValidationError(messages -> messages.addErrorsCrudFailedToCreateCrudTable(GLOBAL), toEditHtml());
             throwValidationError(messages -> messages.addErrorsCrudFailedToCreateCrudTable(GLOBAL), toEditHtml());
         });
         });
-        return redirect(getClass());
+        return redirectWith(getClass(), moreUrl("list/1").params("dictId", form.dictId));
     }
     }
 
 
     @Token(save = false, validate = true)
     @Token(save = false, validate = true)
@@ -322,7 +322,7 @@ public class AdminDictKuromojiAction extends FessAdminAction {
         }).orElse(() -> {
         }).orElse(() -> {
             throwValidationError(messages -> messages.addErrorsCrudCouldNotFindCrudTable(GLOBAL, form.getDisplayId()), toEditHtml());
             throwValidationError(messages -> messages.addErrorsCrudCouldNotFindCrudTable(GLOBAL, form.getDisplayId()), toEditHtml());
         });
         });
-        return redirect(getClass());
+        return redirectWith(getClass(), moreUrl("list/1").params("dictId", form.dictId));
     }
     }
 
 
     @Execute
     @Execute
@@ -335,7 +335,7 @@ public class AdminDictKuromojiAction extends FessAdminAction {
         }).orElse(() -> {
         }).orElse(() -> {
             throwValidationError(messages -> messages.addErrorsCrudCouldNotFindCrudTable(GLOBAL, form.getDisplayId()), toEditHtml());
             throwValidationError(messages -> messages.addErrorsCrudCouldNotFindCrudTable(GLOBAL, form.getDisplayId()), toEditHtml());
         });
         });
-        return redirect(getClass());
+        return redirectWith(getClass(), moreUrl("list/1").params("dictId", form.dictId));
     }
     }
 
 
     //===================================================================================
     //===================================================================================

+ 2 - 0
src/main/webapp/WEB-INF/view/admin/dict/kuromoji/confirm.jsp

@@ -45,7 +45,9 @@
 		<la:form>
 		<la:form>
 			<la:hidden property="crudMode" />
 			<la:hidden property="crudMode" />
             <la:hidden property="dictId" />
             <la:hidden property="dictId" />
+            <c:if test="${crudMode==2 || crudMode==3 || crudMode==4}">
             <la:hidden property="id" />
             <la:hidden property="id" />
+            </c:if>
 			<div class="row">
 			<div class="row">
 			<div class="col-md-12">
 			<div class="col-md-12">
 				<div class="box">
 				<div class="box">

+ 2 - 0
src/main/webapp/WEB-INF/view/admin/dict/synonym/confirm.jsp

@@ -45,7 +45,9 @@
 		<la:form>
 		<la:form>
 			<la:hidden property="crudMode" />
 			<la:hidden property="crudMode" />
             <la:hidden property="dictId" />
             <la:hidden property="dictId" />
+            <c:if test="${crudMode==2 || crudMode==3 || crudMode==4}">
             <la:hidden property="id" />
             <la:hidden property="id" />
+            </c:if>
 			<div class="row">
 			<div class="row">
 			<div class="col-md-12">
 			<div class="col-md-12">
 				<div class="box">
 				<div class="box">