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

fix #947 remove searchParams

Browse source
This commit is contained in:
Shinsuke Sugaya 2017-03-24 23:16:58 +09:00
parent 7b83242fb3
commit 9000284e26
11 changed files with 21 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
src/main/java/org/codelibs/fess/Constants.java
View file

@ -339,9 +339,8 @@ public class Constants extends CoreLibConstants {
public static final String DATA_CRAWLER_TYPE = "data_crawling";
// TODO remove searchParams
public static final String[] COMMON_CONVERSION_RULE = new String[] { "searchParams", "crudMode", "createdBy", "createdTime",
"updatedBy", "updatedTime" };
public static final String[] COMMON_CONVERSION_RULE =
new String[] { "crudMode", "createdBy", "createdTime", "updatedBy", "updatedTime" };
public static final String USER_INFO = "LoginInfo";

4
src/main/java/org/codelibs/fess/app/web/admin/dict/ListForm.java
View file

@ -15,13 +15,9 @@
*/
package org.codelibs.fess.app.web.admin.dict;
import java.util.HashMap;
import java.util.Map;
/**
* @author Keiichi Watanabe
*/
public class ListForm {
public Map<String, String> searchParams = new HashMap<>();
}

4
src/main/java/org/codelibs/fess/app/web/api/admin/suggest/ApiAdminSuggestAction.java
View file

@ -15,14 +15,14 @@
*/
package org.codelibs.fess.app.web.api.admin.suggest;
import javax.annotation.Resource;
import org.codelibs.fess.app.web.api.ApiResult;
import org.codelibs.fess.app.web.api.admin.FessApiAdminAction;
import org.codelibs.fess.helper.SuggestHelper;
import org.lastaflute.web.Execute;
import org.lastaflute.web.response.JsonResponse;
import javax.annotation.Resource;
public class ApiAdminSuggestAction extends FessApiAdminAction {
@Resource

15
src/main/java/org/codelibs/fess/app/web/api/admin/suggest/SuggestBody.java
View file

@ -1,3 +1,18 @@
/*
* Copyright 2012-2017 CodeLibs Project and the Others.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND,
* either express or implied. See the License for the specific language
* governing permissions and limitations under the License.
*/
package org.codelibs.fess.app.web.api.admin.suggest;
import org.codelibs.fess.app.web.admin.suggest.SuggestForm;

3
src/main/java/org/codelibs/fess/mylasta/action/FessLabels.java
View file

@ -431,9 +431,6 @@ public class FessLabels extends UserMessages {
/** The key of the message: Term */
public static final String LABELS_TERM = "{labels.term}";
/** The key of the message: Search Parameters */
public static final String LABELS_SEARCH_PARAMS = "{labels.searchParams}";
/** The key of the message: Fields */
public static final String LABELS_FIELDS = "{labels.fields}";

1
src/main/resources/fess_label.properties
View file

@ -133,7 +133,6 @@ labels.suggestSearchLog=Suggest Search Log
labels.suggestWord=Suggest Word
labels.targetLabel=Label
labels.term=Term
labels.searchParams=Search Parameters
labels.fields=Fields
labels.ex_q=Extended Query
labels.ldapProviderUrl=LDAP URL

1
src/main/resources/fess_label_en.properties
View file

@ -133,7 +133,6 @@ labels.suggestSearchLog=Suggest Search Log
labels.suggestWord=Suggest Word
labels.targetLabel=Label
labels.term=Term
labels.searchParams=Search Parameters
labels.fields=Fields
labels.ex_q=Extended Query
labels.ldapProviderUrl=LDAP URL

1
src/main/resources/fess_label_ja.properties
View file

@ -133,7 +133,6 @@ labels.suggestSearchLog=\u30b5\u30b8\u30a7\u30b9\u30c8\u7528\u691c\u7d22\u30ed\u
labels.suggestWord=\u30b5\u30b8\u30a7\u30b9\u30c8\u30ef\u30fc\u30c9
labels.targetLabel=\u30e9\u30d9\u30eb
labels.term=\u691c\u7d22\u8a9e
labels.searchParams=\u691c\u7d22\u30d1\u30e9\u30e1\u30fc\u30bf
labels.fields=\u30d5\u30a3\u30fc\u30eb\u30c9
labels.ex_q=\u62e1\u5f35\u30af\u30a8\u30ea\u30fc
labels.oldPassword=\u73fe\u5728\u306e\u30d1\u30b9\u30ef\u30fc\u30c9

1
src/main/resources/fess_label_ko.properties
View file

@ -133,7 +133,6 @@ labels.suggestSearchLog = \uc790\ub3d9\uc644\uc131\uc6a9 \uac80\uc0c9 \ub85c\uad
labels.suggestWord = \uc790\ub3d9\uc644\uc131 \ub2e8\uc5b4
labels.targetLabel = \ub808\uc774\ube14(Label)
labels.term = \uac80\uc0c9\uc5b4
labels.searchParams = \uac80\uc0c9 \ub9e4\uac1c \ubcc0\uc218
labels.fields = \ud544\ub4dc
labels.ex_q = \ud655\uc7a5 \ucffc\ub9ac
labels.oldPassword = \ud604\uc7ac \ube44\ubc00\ubc88\ud638

1
src/main/resources/fess_label_ru.properties
View file

@ -132,7 +132,6 @@ labels.suggestSearchLog=\u0416\u0443\u0440\u043d\u0430\u043b \u043f\u0440\u0435\
labels.suggestWord=\u041f\u0440\u0435\u0434\u043b\u0430\u0433\u0430\u0435\u043c\u044b\u0435 \u0441\u043b\u043e\u0432\u0430
labels.targetLabel=\u041d\u0430\u0437\u0432\u0430\u043d\u0438\u0435
labels.term=\u0421\u0440\u043e\u043a
labels.searchParams=\u041f\u0430\u0440\u0430\u043c\u0435\u0442\u0440\u044b \u043f\u043e\u0438\u0441\u043a\u0430
labels.fields=\u041f\u043e\u043b\u044f
labels.ex_q=\u0420\u0430\u0441\u0448\u0438\u0440\u0435\u043d\u043d\u044b\u0439 \u0437\u0430\u043f\u0440\u043e\u0441
labels.ldapProviderUrl=LDAP URL

6
src/main/webapp/WEB-INF/view/admin/design/admin_design.jsp
View file

@ -194,8 +194,7 @@
<!-- /.box-header -->
<div class="box-body">
<div class="form-group row">
<label for="searchParams.url"
class="col-sm-3 form-control-label"><la:message
<label class="col-sm-3 form-control-label"><la:message
key="labels.design_file" /></label>
<div class="col-sm-9">
<la:errors property="designFile" />
@ -203,8 +202,7 @@
</div>
</div>
<div class="form-group row">
<label for="searchParams.url"
class="col-sm-3 form-control-label"><la:message
<label class="col-sm-3 form-control-label"><la:message
key="labels.design_file_name" /></label>
<div class="col-sm-9">
<la:errors property="designFileName" />