diff --git a/services/src/main/java/org/exoplatform/task/service/ProjectService.java b/services/src/main/java/org/exoplatform/task/service/ProjectService.java index 50c25093a..a6e09f678 100644 --- a/services/src/main/java/org/exoplatform/task/service/ProjectService.java +++ b/services/src/main/java/org/exoplatform/task/service/ProjectService.java @@ -18,15 +18,14 @@ */ package org.exoplatform.task.service; -import org.exoplatform.commons.utils.ListAccess; +import java.util.List; +import java.util.Set; + import org.exoplatform.task.dao.OrderBy; import org.exoplatform.task.dao.ProjectQuery; import org.exoplatform.task.dto.ProjectDto; import org.exoplatform.task.exception.EntityNotFoundException; -import java.util.List; -import java.util.Set; - public interface ProjectService { diff --git a/services/src/main/java/org/exoplatform/task/service/impl/ProjectServiceImpl.java b/services/src/main/java/org/exoplatform/task/service/impl/ProjectServiceImpl.java index 7107322e5..b1ec90174 100644 --- a/services/src/main/java/org/exoplatform/task/service/impl/ProjectServiceImpl.java +++ b/services/src/main/java/org/exoplatform/task/service/impl/ProjectServiceImpl.java @@ -190,7 +190,6 @@ public ProjectDto getProject(Long id) throws EntityNotFoundException { @Override public List getSubProjects(long parentId, int offset, int limit) { try { - ProjectDto parent = getProject(parentId); return projectStorage.getSubProjects(parentId, offset, limit); } catch (Exception ex) { return new ArrayList(); diff --git a/services/src/main/java/org/exoplatform/task/util/StorageUtil.java b/services/src/main/java/org/exoplatform/task/util/StorageUtil.java index b445f4ee4..688aadf5b 100644 --- a/services/src/main/java/org/exoplatform/task/util/StorageUtil.java +++ b/services/src/main/java/org/exoplatform/task/util/StorageUtil.java @@ -226,7 +226,7 @@ public static ProjectDto projectToDto(Project project, ProjectStorage projectSto } ProjectDto projectDto = new ProjectDto(); projectDto.setId(project.getId()); - projectDto.setName(project.getName()); + projectDto.setName(HTMLSanitizer.sanitize(project.getName())); projectDto.setDescription(project.getDescription()); projectDto.setColor(project.getColor()); projectDto.setDueDate(project.getDueDate()); @@ -234,9 +234,6 @@ public static ProjectDto projectToDto(Project project, ProjectStorage projectSto projectDto.setParticipator(projectStorage.getParticipator(project.getId())); projectDto.setManager(projectStorage.getManager(project.getId())); projectDto.setParent(projectToDto(project.getParent(),projectStorage)); - //if(project.getStatus()!=null)projectDto.setStatus(project.getStatus().stream().map(status -> statusToDTO(status,projectStorage)).collect(Collectors.toSet())); - - //if(project.getChildren()!=null)projectDto.setChildren(project.getChildren().stream().map(this::projectToDto).collect(Collectors.toList())); return projectDto; }