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

merge issues

parent d5c6648c
This diff is collapsed.
......@@ -106,8 +106,9 @@ public class ProjectController extends BaseController {
@Autowired
public ProjectController(ServletContext context, IUserService userService, IProjectService projectService,
IMeshService meshService, List<Converter> modelConverters, IFileService fileService, IElementService elementService, IReactionService reactionService,
IModelService modelService, IConfigurationService configurationService, IProjectBackgroundService projectBackgroundService) {
IMeshService meshService, List<Converter> modelConverters, IFileService fileService, IElementService elementService,
IReactionService reactionService, IModelService modelService, IConfigurationService configurationService,
IProjectBackgroundService projectBackgroundService) {
this.context = context;
this.userService = userService;
this.projectService = projectService;
......
......@@ -1147,7 +1147,8 @@ public class ProjectControllerIntegrationTest extends ControllerIntegrationTest
Project project = projectService.getProjectByProjectId(TEST_PROJECT);
List<ProjectBackground> backgrounds = projectBackgroundService.getProjectBackgroundsByProject(project);
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());
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