Skip to content
GitLab
Menu
Projects
Groups
Snippets
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in
Toggle navigation
Menu
Open sidebar
minerva
core
Commits
21fa9bed
Commit
21fa9bed
authored
Sep 13, 2021
by
Piotr Gawron
Browse files
merge issues
parent
d5c6648c
Changes
3
Expand all
Hide whitespace changes
Inline
Side-by-side
frontend-js/package-lock.json
View file @
21fa9bed
This diff is collapsed.
Click to expand it.
rest-api/src/main/java/lcsb/mapviewer/api/projects/ProjectController.java
View file @
21fa9bed
...
...
@@ -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
;
...
...
web/src/test/java/lcsb/mapviewer/web/ProjectControllerIntegrationTest.java
View file @
21fa9bed
...
...
@@ -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
,
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment