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

add missing items

Browse source
This commit is contained in:
Shinsuke Sugaya 2015-09-05 08:36:15 +09:00
parent 406bbbedef
commit 13a046491c
3 changed files with 59 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

28
src/main/java/org/codelibs/fess/app/web/admin/dataconfig/AdminDataconfigAction.java
View file

@ -16,11 +16,14 @@
package org.codelibs.fess.app.web.admin.dataconfig;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import javax.annotation.Resource;
import org.codelibs.fess.Constants;
import org.codelibs.fess.annotation.Token;
import org.codelibs.fess.app.pager.DataConfigPager;
import org.codelibs.fess.app.service.DataConfigService;
@ -28,6 +31,7 @@ import org.codelibs.fess.app.service.LabelTypeService;
import org.codelibs.fess.app.service.RoleTypeService;
import org.codelibs.fess.app.web.base.FessAdminAction;
import org.codelibs.fess.crud.CommonConstants;
import org.codelibs.fess.ds.DataStoreFactory;
import org.codelibs.fess.es.exentity.DataConfig;
import org.codelibs.fess.helper.SystemHelper;
import org.lastaflute.web.Execute;
@ -55,6 +59,8 @@ public class AdminDataconfigAction extends FessAdminAction {
protected RoleTypeService roleTypeService;
@Resource
protected LabelTypeService labelTypeService;
@Resource
protected DataStoreFactory dataStoreFactory;
// ===================================================================================
// Hook
@ -126,6 +132,7 @@ public class AdminDataconfigAction extends FessAdminAction {
form.crudMode = CommonConstants.CREATE_MODE;
return asHtml(path_AdminDataconfig_EditJsp).renderWith(data -> {
registerRolesAndLabels(data);
registerHandlerNames(data);
});
}
@ -138,6 +145,7 @@ public class AdminDataconfigAction extends FessAdminAction {
loadDataConfig(form);
return asHtml(path_AdminDataconfig_EditJsp).renderWith(data -> {
registerRolesAndLabels(data);
registerHandlerNames(data);
});
}
@ -146,6 +154,7 @@ public class AdminDataconfigAction extends FessAdminAction {
public HtmlResponse editagain(final DataConfigEditForm form) {
return asHtml(path_AdminDataconfig_EditJsp).renderWith(data -> {
registerRolesAndLabels(data);
registerHandlerNames(data);
});
}
@ -156,6 +165,7 @@ public class AdminDataconfigAction extends FessAdminAction {
loadDataConfig(form);
return asHtml(path_AdminDataconfig_EditJsp).renderWith(data -> {
registerRolesAndLabels(data);
registerHandlerNames(data);
});
}
@ -168,6 +178,7 @@ public class AdminDataconfigAction extends FessAdminAction {
loadDataConfig(form);
return asHtml(path_AdminDataconfig_ConfirmJsp).renderWith(data -> {
registerRolesAndLabels(data);
registerHandlerNames(data);
});
}
@ -178,6 +189,7 @@ public class AdminDataconfigAction extends FessAdminAction {
loadDataConfig(form);
return asHtml(path_AdminDataconfig_ConfirmJsp).renderWith(data -> {
registerRolesAndLabels(data);
registerHandlerNames(data);
});
}
@ -193,6 +205,7 @@ public class AdminDataconfigAction extends FessAdminAction {
loadDataConfig(form);
return asHtml(path_AdminDataconfig_ConfirmJsp).renderWith(data -> {
registerRolesAndLabels(data);
registerHandlerNames(data);
});
} catch (final Exception e) {
e.printStackTrace();
@ -206,6 +219,7 @@ public class AdminDataconfigAction extends FessAdminAction {
validate(form, messages -> {}, toEditHtml());
return asHtml(path_AdminDataconfig_ConfirmJsp).renderWith(data -> {
registerRolesAndLabels(data);
registerHandlerNames(data);
});
}
@ -215,6 +229,7 @@ public class AdminDataconfigAction extends FessAdminAction {
validate(form, messages -> {}, toEditHtml());
return asHtml(path_AdminDataconfig_ConfirmJsp).renderWith(data -> {
registerRolesAndLabels(data);
registerHandlerNames(data);
});
}
@ -290,6 +305,18 @@ public class AdminDataconfigAction extends FessAdminAction {
data.register("labelTypeItems", labelTypeService.getLabelTypeList());
}
public void registerHandlerNames(final RenderData data) {
final List<String> dataStoreNameList = dataStoreFactory.getDataStoreNameList();
final List<Map<String, String>> itemList = new ArrayList<Map<String, String>>();
for (final String name : dataStoreNameList) {
final Map<String, String> map = new HashMap<String, String>();
map.put(Constants.ITEM_LABEL, name);
map.put(Constants.ITEM_VALUE, name);
itemList.add(map);
}
data.register("handlerNameItems", itemList);
}
// ===================================================================================
// Small Helper
// ============
@ -305,6 +332,7 @@ public class AdminDataconfigAction extends FessAdminAction {
return () -> {
return asHtml(path_AdminDataconfig_EditJsp).renderWith(data -> {
registerRolesAndLabels(data);
registerHandlerNames(data);
});
};
}

39
src/main/java/org/codelibs/fess/app/web/admin/labeltype/AdminLabeltypeAction.java
View file

@ -24,6 +24,7 @@ import javax.annotation.Resource;
import org.codelibs.fess.annotation.Token;
import org.codelibs.fess.app.pager.LabelTypePager;
import org.codelibs.fess.app.service.LabelTypeService;
import org.codelibs.fess.app.service.RoleTypeService;
import org.codelibs.fess.app.web.base.FessAdminAction;
import org.codelibs.fess.crud.CommonConstants;
import org.codelibs.fess.es.exentity.LabelType;
@ -48,6 +49,8 @@ public class AdminLabeltypeAction extends FessAdminAction {
private LabelTypePager labelTypePager;
@Resource
private SystemHelper systemHelper;
@Resource
protected RoleTypeService roleTypeService;
// ===================================================================================
// Hook
@ -117,7 +120,9 @@ public class AdminLabeltypeAction extends FessAdminAction {
public HtmlResponse createpage(final LabelTypeEditForm form) {
form.initialize();
form.crudMode = CommonConstants.CREATE_MODE;
return asHtml(path_AdminLabeltype_EditJsp);
return asHtml(path_AdminLabeltype_EditJsp).renderWith(data -> {
data.register("roleTypeItems", roleTypeService.getRoleTypeList());
});
}
@Token(save = true, validate = false)
@ -127,13 +132,17 @@ public class AdminLabeltypeAction extends FessAdminAction {
form.id = id;
verifyCrudMode(form, CommonConstants.EDIT_MODE);
loadLabelType(form);
return asHtml(path_AdminLabeltype_EditJsp);
return asHtml(path_AdminLabeltype_EditJsp).renderWith(data -> {
data.register("roleTypeItems", roleTypeService.getRoleTypeList());
});
}
@Token(save = true, validate = false)
@Execute
public HtmlResponse editagain(final LabelTypeEditForm form) {
return asHtml(path_AdminLabeltype_EditJsp);
return asHtml(path_AdminLabeltype_EditJsp).renderWith(data -> {
data.register("roleTypeItems", roleTypeService.getRoleTypeList());
});
}
@Token(save = true, validate = false)
@ -141,7 +150,9 @@ public class AdminLabeltypeAction extends FessAdminAction {
public HtmlResponse editfromconfirm(final LabelTypeEditForm form) {
form.crudMode = CommonConstants.EDIT_MODE;
loadLabelType(form);
return asHtml(path_AdminLabeltype_EditJsp);
return asHtml(path_AdminLabeltype_EditJsp).renderWith(data -> {
data.register("roleTypeItems", roleTypeService.getRoleTypeList());
});
}
@Token(save = true, validate = false)
@ -151,7 +162,9 @@ public class AdminLabeltypeAction extends FessAdminAction {
form.id = id;
verifyCrudMode(form, CommonConstants.DELETE_MODE);
loadLabelType(form);
return asHtml(path_AdminLabeltype_ConfirmJsp);
return asHtml(path_AdminLabeltype_ConfirmJsp).renderWith(data -> {
data.register("roleTypeItems", roleTypeService.getRoleTypeList());
});
}
@Token(save = true, validate = false)
@ -159,7 +172,9 @@ public class AdminLabeltypeAction extends FessAdminAction {
public HtmlResponse deletefromconfirm(final LabelTypeEditForm form) {
form.crudMode = CommonConstants.DELETE_MODE;
loadLabelType(form);
return asHtml(path_AdminLabeltype_ConfirmJsp);
return asHtml(path_AdminLabeltype_ConfirmJsp).renderWith(data -> {
data.register("roleTypeItems", roleTypeService.getRoleTypeList());
});
}
// -----------------------------------------------------
@ -171,21 +186,27 @@ public class AdminLabeltypeAction extends FessAdminAction {
form.id = id;
verifyCrudMode(form, CommonConstants.CONFIRM_MODE);
loadLabelType(form);
return asHtml(path_AdminLabeltype_ConfirmJsp);
return asHtml(path_AdminLabeltype_ConfirmJsp).renderWith(data -> {
data.register("roleTypeItems", roleTypeService.getRoleTypeList());
});
}
@Token(save = false, validate = true, keep = true)
@Execute
public HtmlResponse confirmfromcreate(final LabelTypeEditForm form) {
validate(form, messages -> {}, toEditHtml());
return asHtml(path_AdminLabeltype_ConfirmJsp);
return asHtml(path_AdminLabeltype_ConfirmJsp).renderWith(data -> {
data.register("roleTypeItems", roleTypeService.getRoleTypeList());
});
}
@Token(save = false, validate = true, keep = true)
@Execute
public HtmlResponse confirmfromupdate(final LabelTypeEditForm form) {
validate(form, messages -> {}, toEditHtml());
return asHtml(path_AdminLabeltype_ConfirmJsp);
return asHtml(path_AdminLabeltype_ConfirmJsp).renderWith(data -> {
data.register("roleTypeItems", roleTypeService.getRoleTypeList());
});
}
// -----------------------------------------------------

2
src/main/java/org/codelibs/fess/app/web/admin/webconfig/AdminWebconfigAction.java
View file

@ -143,7 +143,7 @@ public class AdminWebconfigAction extends FessAdminAction {
@Token(save = true, validate = false)
@Execute
public HtmlResponse editagain(final WebConfigEditForm form) {
return asHtml(path_AdminWebconfig_EditJsp).renderWith(data -> {
return asHtml(path_AdminWebconfig_EditJsp).renderWith(data -> {
registerRolesAndLabels(data);
});
}