Commit 21fa9bed authored by Piotr Gawron's avatar Piotr Gawron
Browse files

merge issues

parent d5c6648c
This source diff could not be displayed because it is too large. You can view the blob instead.
...@@ -106,8 +106,9 @@ public class ProjectController extends BaseController { ...@@ -106,8 +106,9 @@ public class ProjectController extends BaseController {
@Autowired @Autowired
public ProjectController(ServletContext context, IUserService userService, IProjectService projectService, public ProjectController(ServletContext context, IUserService userService, IProjectService projectService,
IMeshService meshService, List<Converter> modelConverters, IFileService fileService, IElementService elementService, IReactionService reactionService, IMeshService meshService, List<Converter> modelConverters, IFileService fileService, IElementService elementService,
IModelService modelService, IConfigurationService configurationService, IProjectBackgroundService projectBackgroundService) { IReactionService reactionService, IModelService modelService, IConfigurationService configurationService,
IProjectBackgroundService projectBackgroundService) {
this.context = context; this.context = context;
this.userService = userService; this.userService = userService;
this.projectService = projectService; this.projectService = projectService;
......
...@@ -1147,7 +1147,8 @@ public class ProjectControllerIntegrationTest extends ControllerIntegrationTest ...@@ -1147,7 +1147,8 @@ public class ProjectControllerIntegrationTest extends ControllerIntegrationTest
Project project = projectService.getProjectByProjectId(TEST_PROJECT); Project project = projectService.getProjectByProjectId(TEST_PROJECT);
List<ProjectBackground> backgrounds = projectBackgroundService.getProjectBackgroundsByProject(project); List<ProjectBackground> backgrounds = projectBackgroundService.getProjectBackgroundsByProject(project);
ProjectBackground background = backgrounds.get(0); ProjectBackground background = backgrounds.get(0);
String path = "src/main/webapp/../map_images/" + project.getDirectory() + "/" + background.getProjectBackgroundImageLayer().iterator().next().getDirectory(); String path = "src/main/webapp/../map_images/" + project.getDirectory() + "/"
+ background.getProjectBackgroundImageLayer().iterator().next().getDirectory();
assertTrue(new File(path).exists()); assertTrue(new File(path).exists());
request = delete("/api/projects/{projectId}/backgrounds/{backgroundId}", TEST_PROJECT, request = delete("/api/projects/{projectId}/backgrounds/{backgroundId}", TEST_PROJECT,
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment