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

fix #2097 remove label

Browse source
This commit is contained in:
Shinsuke Sugaya 2019-04-25 16:42:57 +09:00
parent e1251fdd76
commit a8965739cb
4 changed files with 0 additions and 31 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -31,7 +31,6 @@ import org.codelibs.core.lang.StringUtil;
import org.codelibs.fess.Constants;
import org.codelibs.fess.app.pager.DataConfigPager;
import org.codelibs.fess.app.service.DataConfigService;
import org.codelibs.fess.app.service.LabelTypeService;
import org.codelibs.fess.app.service.RoleTypeService;
import org.codelibs.fess.app.web.CrudMode;
import org.codelibs.fess.app.web.base.FessAdminAction;
@ -64,8 +63,6 @@ public class AdminDataconfigAction extends FessAdminAction {
@Resource
private RoleTypeService roleTypeService;
@Resource
private LabelTypeService labelTypeService;
@Resource
protected DataStoreFactory dataStoreFactory;
// ===================================================================================
@ -323,7 +320,6 @@ public class AdminDataconfigAction extends FessAdminAction {
protected void registerRolesAndLabels(final RenderData data) {
RenderDataUtil.register(data, "roleTypeItems", roleTypeService.getRoleTypeList());
RenderDataUtil.register(data, "labelTypeItems", labelTypeService.getLabelTypeList());
}
protected void registerHandlerNames(final RenderData data) {

2
src/main/java/org/codelibs/fess/app/web/admin/dataconfig/CreateForm.java
View file

@ -31,8 +31,6 @@ import org.lastaflute.web.validation.theme.conversion.ValidateTypeFailure;
*/
public class CreateForm {
public String[] labelTypeIds;
@ValidateTypeFailure
public Integer crudMode;

12
src/main/webapp/WEB-INF/view/admin/dataconfig/admin_dataconfig_details.jsp
View file

@ -92,18 +92,6 @@
<td>${f:br(f:h(virtualHosts))}<la:hidden
property="virtualHosts" /></td>
</tr>
<tr>
<th><la:message key="labels.label_type" /></th>
<td><c:forEach var="l" varStatus="s"
items="${labelTypeItems}">
<c:forEach var="ltid" varStatus="s"
items="${labelTypeIds}">
<c:if test="${ltid==l.id}">
${f:h(l.name)}<br />
</c:if>
</c:forEach>
</c:forEach></td>
</tr>
<tr>
<th><la:message key="labels.available" /></th>
<td><la:hidden property="available" /> <c:if

13
src/main/webapp/WEB-INF/view/admin/dataconfig/admin_dataconfig_edit.jsp
View file

@ -111,19 +111,6 @@
rows="5" />
</div>
</div>
<div class="form-group">
<label for="labelTypeIds" class="col-sm-3 control-label"><la:message
key="labels.label_type" /></label>
<div class="col-sm-9">
<la:errors property="labelTypeIds" />
<la:select styleId="labelTypeIds" property="labelTypeIds" multiple="true"
styleClass="form-control">
<c:forEach var="l" varStatus="s" items="${labelTypeItems}">
<la:option value="${f:u(l.id)}">${f:h(l.name)}</la:option>
</c:forEach>
</la:select>
</div>
</div>
<div class="form-group">
<label for="available" class="col-sm-3 control-label"><la:message
key="labels.available" /></label>