ViSnezh
This commit is contained in:
1 parent
43508ff6c4
commit
a90452424f
2 files changed
+4
-5
No files matched your search
@@ -40,8 +40,8 @@ public class ProjectController {
|
|||||||
return modelAndView;
|
return modelAndView;
|
||||||
}
|
}
|
||||||
|
|
||||||
@PatchMapping("/{projectId}/update")
|
@PatchMapping("/{projectId}/edit")
|
||||||
public ModelAndView updateProject(@ModelAttribute("projectUpdate") ProjectRequest projectRequest,
|
public ModelAndView editProject(@ModelAttribute("projectUpdate") ProjectRequest projectRequest,
|
||||||
@PathVariable("projectId") Long projectId,
|
@PathVariable("projectId") Long projectId,
|
||||||
BindingResult bindingResult,
|
BindingResult bindingResult,
|
||||||
Principal principal) {
|
Principal principal) {
|
||||||
@@ -53,7 +53,7 @@ public class ProjectController {
|
|||||||
}
|
}
|
||||||
|
|
||||||
Project projectUpdated = projectService
|
Project projectUpdated = projectService
|
||||||
.updateProject(projectRequest, projectId, principal);
|
.editProject(projectRequest, projectId, principal);
|
||||||
modelAndView.addObject(projectUpdated);
|
modelAndView.addObject(projectUpdated);
|
||||||
modelAndView.setViewName("project");
|
modelAndView.setViewName("project");
|
||||||
return modelAndView;
|
return modelAndView;
|
||||||
|
|||||||
@@ -17,7 +17,6 @@ import java.security.Principal;
|
|||||||
import java.util.Arrays;
|
import java.util.Arrays;
|
||||||
import java.util.LinkedHashSet;
|
import java.util.LinkedHashSet;
|
||||||
import java.util.List;
|
import java.util.List;
|
||||||
import java.util.Set;
|
|
||||||
import java.util.stream.Collectors;
|
import java.util.stream.Collectors;
|
||||||
|
|
||||||
@Service
|
@Service
|
||||||
@@ -35,7 +34,7 @@ public class ProjectService {
|
|||||||
return projectRepo.save(project);
|
return projectRepo.save(project);
|
||||||
}
|
}
|
||||||
|
|
||||||
public Project updateProject(ProjectRequest projectRequest, Long projectId, Principal principal) {
|
public Project editProject(ProjectRequest projectRequest, Long projectId, Principal principal) {
|
||||||
if (!projectIsBelongUser(getProjectById(projectId), principal))
|
if (!projectIsBelongUser(getProjectById(projectId), principal))
|
||||||
throw new RuntimeException("This project cannot be changed");
|
throw new RuntimeException("This project cannot be changed");
|
||||||
|
|
||||||
|
|||||||
Reference in new issue
Block a user