From c1120d5745ff5a48e31950d106f898a8d76e632e Mon Sep 17 00:00:00 2001
From: Shinsuke Sugaya <shinsuke@yahoo.co.jp>
Date: Sat, 17 Oct 2015 09:11:50 +0900
Subject: [PATCH] add roles to label
---
.../fess/app/service/LabelTypeService.java | 14 +++++++++++++-
.../web/admin/labeltype/AdminLabeltypeAction.java | 1 -
2 files changed, 13 insertions(+), 2 deletions(-)
diff --git a/src/main/java/org/codelibs/fess/app/service/LabelTypeService.java b/src/main/java/org/codelibs/fess/app/service/LabelTypeService.java
index d89818259..8d0a636c0 100644
--- a/src/main/java/org/codelibs/fess/app/service/LabelTypeService.java
+++ b/src/main/java/org/codelibs/fess/app/service/LabelTypeService.java
@@ -191,7 +191,19 @@ public class LabelTypeService implements Serializable {
}
public OptionalEntity<LabelType> getLabelType(final String id) {
- return labelTypeBhv.selectByPK(id);
+ return labelTypeBhv.selectByPK(id).map(entity -> {
+ final List<LabelToRole> wctrtmList = labelToRoleBhv.selectList(wctrtmCb -> {
+ wctrtmCb.query().setLabelTypeId_Equal(entity.getId());
+ });
+ if (!wctrtmList.isEmpty()) {
+ final List<String> roleTypeIds = new ArrayList<String>(wctrtmList.size());
+ for (final LabelToRole mapping : wctrtmList) {
+ roleTypeIds.add(mapping.getRoleTypeId());
+ }
+ entity.setRoleTypeIds(roleTypeIds.toArray(new String[roleTypeIds.size()]));
+ }
+ return entity;
+ });
}
}
diff --git a/src/main/java/org/codelibs/fess/app/web/admin/labeltype/AdminLabeltypeAction.java b/src/main/java/org/codelibs/fess/app/web/admin/labeltype/AdminLabeltypeAction.java
index 6d0da998f..c7f785b6c 100644
--- a/src/main/java/org/codelibs/fess/app/web/admin/labeltype/AdminLabeltypeAction.java
+++ b/src/main/java/org/codelibs/fess/app/web/admin/labeltype/AdminLabeltypeAction.java
@@ -16,7 +16,6 @@
package org.codelibs.fess.app.web.admin.labeltype;
-
import javax.annotation.Resource;
import org.codelibs.fess.Constants;
--
GitLab