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

fix #1290 add sort orders

Browse source
This commit is contained in:
Shinsuke Sugaya 2017-09-28 17:23:26 +09:00
parent fe895afb19
commit 2ee2160dcc
3 changed files with 9 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
src/main/java/org/codelibs/fess/app/service/DataConfigService.java
View file

@ -88,16 +88,17 @@ public class DataConfigService {
public List<DataConfig> getAllDataConfigList(final boolean withLabelType, final boolean withRoleType, final boolean available,
final List<String> idList) {
final List<DataConfig> list = dataConfigBhv.selectList(cb -> {
return dataConfigBhv.selectList(cb -> {
if (available) {
cb.query().setAvailable_Equal(Constants.T);
}
if (idList != null) {
cb.query().setId_InScope(idList);
}
cb.query().addOrderBy_SortOrder_Asc();
cb.query().addOrderBy_Name_Asc();
cb.fetchFirst(fessConfig.getPageDataConfigMaxFetchSizeAsInteger());
});
return list;
}
public OptionalEntity<DataConfig> getDataConfig(final String id) {

5
src/main/java/org/codelibs/fess/app/service/FileConfigService.java
View file

@ -94,16 +94,17 @@ public class FileConfigService {
public List<FileConfig> getAllFileConfigList(final boolean withLabelType, final boolean withRoleType, final boolean available,
final List<String> idList) {
final List<FileConfig> list = fileConfigBhv.selectList(cb -> {
return fileConfigBhv.selectList(cb -> {
if (available) {
cb.query().setAvailable_Equal(Constants.T);
}
if (idList != null) {
cb.query().setId_InScope(idList);
}
cb.query().addOrderBy_SortOrder_Asc();
cb.query().addOrderBy_Name_Asc();
cb.fetchFirst(fessConfig.getPageFileConfigMaxFetchSizeAsInteger());
});
return list;
}
public OptionalEntity<FileConfig> getFileConfig(final String id) {

6
src/main/java/org/codelibs/fess/app/service/WebConfigService.java
View file

@ -102,17 +102,17 @@ public class WebConfigService {
public List<WebConfig> getAllWebConfigList(final boolean withLabelType, final boolean withRoleType, final boolean available,
final List<String> idList) {
final List<WebConfig> list = webConfigBhv.selectList(cb -> {
return webConfigBhv.selectList(cb -> {
if (available) {
cb.query().setAvailable_Equal(Constants.T);
}
if (idList != null) {
cb.query().setId_InScope(idList);
}
cb.query().addOrderBy_SortOrder_Asc();
cb.query().addOrderBy_Name_Asc();
cb.fetchFirst(fessConfig.getPageWebConfigMaxFetchSizeAsInteger());
});
return list;
}
public OptionalEntity<WebConfig> getWebConfig(final String id) {