Commit 788cdd68 authored by Piotr Gawron's avatar Piotr Gawron
Browse files

merge issues

parent 3b00a3b7
Pipeline #46923 failed with stage
in 20 minutes and 43 seconds
......@@ -71,6 +71,7 @@ public class ProjectBackgroundService implements IProjectBackgroundService {
List<ProjectBackground> backgrounds = projectBackgroundDao.getProjectBackgroundsByProject(project);
for (ProjectBackground projectBackground : backgrounds) {
Hibernate.initialize(projectBackground.getProjectBackgroundImageLayer());
Hibernate.initialize(projectBackground.getProject());
}
result.addAll(backgrounds);
result.sort(ProjectBackground.ID_COMPARATOR);
......
......@@ -1133,7 +1133,7 @@ public class ProjectControllerIntegrationTest extends ControllerIntegrationTest
new BasicNameValuePair("parser",
"lcsb.mapviewer.converter.model.celldesigner.CellDesignerXmlParser"))));
RequestBuilder request = post("/projects/" + TEST_PROJECT)
RequestBuilder request = post("/api/projects/" + TEST_PROJECT)
.contentType(MediaType.APPLICATION_FORM_URLENCODED)
.content(body)
.session(session);
......@@ -1147,7 +1147,7 @@ public class ProjectControllerIntegrationTest extends ControllerIntegrationTest
String path = "src/main/webapp/../map_images/" + project.getDirectory() + "/" + background.getProjectBackgroundImageLayer().iterator().next().getDirectory();
assertTrue(new File(path).exists());
request = delete("/projects/{projectId}/backgrounds/{backgroundId}", TEST_PROJECT,
request = delete("/api/projects/{projectId}/backgrounds/{backgroundId}", TEST_PROJECT,
backgrounds.get(0).getId())
.session(session);
mockMvc.perform(request)
......
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