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

Role suggest (#530)

Browse source 
*  #502 textfield to textarea

* #502 CSV import export[WIP]

* #502 CSV import export[WIP]
This commit is contained in:
Matsutani Kenji 2016-06-08 23:14:16 +09:00 • committed by Shinsuke Sugaya
parent 5207c4d516
commit eebbcc77bb
2 changed files with 20 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
src/main/java/org/codelibs/fess/app/service/ElevateWordService.java
View file

@ -15,6 +15,8 @@
*/
package org.codelibs.fess.app.service;
import static org.codelibs.core.stream.StreamUtil.stream;
import java.io.IOException;
import java.io.Reader;
import java.io.Serializable;
@ -34,6 +36,7 @@ import org.codelibs.fess.es.config.exbhv.ElevateWordBhv;
import org.codelibs.fess.es.config.exbhv.ElevateWordToLabelBhv;
import org.codelibs.fess.es.config.exentity.ElevateWord;
import org.codelibs.fess.es.config.exentity.ElevateWordToLabel;
import org.codelibs.fess.helper.PermissionHelper;
import org.codelibs.fess.mylasta.direction.FessConfig;
import org.codelibs.fess.util.ComponentUtil;
import org.dbflute.bhv.readable.EntityRowHandler;
@ -192,11 +195,16 @@ public class ElevateWordService implements Serializable {
}
try {
final String role = getValue(list, 2);
final PermissionHelper permissionHelper = ComponentUtil.getPermissionHelper(); // TODO
final String[] permissions =
stream(getValue(list, 2).split(",")).get(
stream -> stream.map(s -> permissionHelper.encode(s)).filter(StringUtil::isNotBlank).distinct()
.toArray(n -> new String[n])); // TODO
final String label = getValue(list, 3);
ElevateWord elevateWord = elevateWordBhv.selectEntity(cb -> {
cb.query().setSuggestWord_Equal(suggestWord);
if (StringUtil.isNotBlank(role)) {
cb.query().setTargetRole_Equal(role);
cb.query().setPermissions_Equal(role);
}
if (StringUtil.isNotBlank(label)) {
cb.query().setTargetLabel_Equal(label);
@ -209,7 +217,7 @@ public class ElevateWordService implements Serializable {
elevateWord = new ElevateWord();
elevateWord.setSuggestWord(suggestWord);
elevateWord.setReading(reading);
elevateWord.setTargetRole(role);
elevateWord.setPermissions(permissions);
elevateWord.setTargetLabel(label);
elevateWord.setBoost(StringUtil.isBlank(boost) ? 1.0f : Float.parseFloat(boost));
elevateWord.setCreatedBy("system");
@ -255,9 +263,17 @@ public class ElevateWordService implements Serializable {
@Override
public void handle(final ElevateWord entity) {
final List<String> list = new ArrayList<>();
final PermissionHelper permissionHelper = new PermissionHelper();
StringBuilder permissions = new StringBuilder();
for (String permission : entity.getPermissions()) {
if (permissions.length() != 0) {
permissions.append(",");
}
permissions.append(permissionHelper.decode(permission));
}
addToList(list, entity.getSuggestWord());
addToList(list, entity.getReading());
addToList(list, entity.getTargetRole());
addToList(list, permissions.toString());
addToList(list, entity.getTargetLabel());
addToList(list, entity.getBoost());
try {

2
src/main/webapp/WEB-INF/view/admin/elevateword/admin_elevateword_edit.jsp
View file

@ -106,7 +106,7 @@
key="labels.elevate_word_permissions" /></label>
<div class="col-sm-9">
<la:errors property="permissions" />
<la:text property="permissions" styleClass="form-control" />
<la:textarea property="permissions" styleClass="form-control" rows="5" />
</div>
</div>
<div class="form-group">