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

fix setting id to entity

Browse source
This commit is contained in:
Kaoru FUZITA 2015-11-10 22:41:14 +09:00
parent 3b5ac3385c
commit 113b794f16
3 changed files with 12 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/main/java/org/codelibs/fess/app/web/admin/group/AdminGroupAction.java
View file

@ -216,7 +216,10 @@ public class AdminGroupAction extends FessAdminAction {
switch (form.crudMode) {
case CrudMode.CREATE:
if (form instanceof CreateForm) {
return OptionalEntity.of(new Group());
return OptionalEntity.of(new Group()).map(entity -> {
entity.setId(Base64.getEncoder().encodeToString(form.name.getBytes(Constants.CHARSET_UTF_8)));
return entity;
});
}
break;
case CrudMode.EDIT:
@ -233,7 +236,6 @@ public class AdminGroupAction extends FessAdminAction {
protected OptionalEntity<Group> createGroup(final CreateForm form) {
return getEntity(form).map(entity -> {
copyBeanToBean(form, entity, op -> op.exclude(Constants.COMMON_CONVERSION_RULE));
entity.setId(Base64.getEncoder().encodeToString(entity.getName().getBytes(Constants.CHARSET_UTF_8)));
return entity;
});
}

6
src/main/java/org/codelibs/fess/app/web/admin/role/AdminRoleAction.java
View file

@ -216,7 +216,10 @@ public class AdminRoleAction extends FessAdminAction {
switch (form.crudMode) {
case CrudMode.CREATE:
if (form instanceof CreateForm) {
return OptionalEntity.of(new Role());
return OptionalEntity.of(new Role()).map(entity -> {
entity.setId(Base64.getEncoder().encodeToString(form.name.getBytes(Constants.CHARSET_UTF_8)));
return entity;
});
}
break;
case CrudMode.EDIT:
@ -233,7 +236,6 @@ public class AdminRoleAction extends FessAdminAction {
protected OptionalEntity<Role> createRole(final CreateForm form) {
return getEntity(form).map(entity -> {
copyBeanToBean(form, entity, op -> op.exclude(Constants.COMMON_CONVERSION_RULE));
entity.setId(Base64.getEncoder().encodeToString(entity.getName().getBytes(Constants.CHARSET_UTF_8)));
return entity;
});
}

6
src/main/java/org/codelibs/fess/app/web/admin/user/AdminUserAction.java
View file

@ -252,7 +252,10 @@ public class AdminUserAction extends FessAdminAction {
switch (form.crudMode) {
case CrudMode.CREATE:
if (form instanceof CreateForm) {
return OptionalEntity.of(new User());
return OptionalEntity.of(new User()).map(entity -> {
entity.setId(Base64.getEncoder().encodeToString(form.name.getBytes(Constants.CHARSET_UTF_8)));
return entity;
});
}
break;
case CrudMode.EDIT:
@ -272,7 +275,6 @@ public class AdminUserAction extends FessAdminAction {
sessionManager.getAttribute(TEMPORARY_PASSWORD, String.class).ifPresent(password -> {
entity.setPassword(password);
});
entity.setId(Base64.getEncoder().encodeToString(entity.getName().getBytes(Constants.CHARSET_UTF_8)));
return entity;
});
}