Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
Submit
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Iterations
Wiki
Requirements
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Locked files
Deploy
Releases
Package registry
Container registry
Model registry
Operate
Terraform modules
Analyze
Contributor analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
GitLab community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
EIP
Labrador
Submit
Merge requests
!235
Deploy fix
Code
Review changes
Check out branch
Open in Workspace
Download
Patches
Plain diff
Expand sidebar
Merged
Deploy fix
development
into
master
Overview
0
Commits
24
Pipelines
0
Changes
17
Merged
Deploy fix
Ruben Backx
requested to merge
development
into
master
Mar 10, 2024
Overview
0
Commits
24
Pipelines
0
Changes
17
0
0
Merge request reports
Compare
master
master (base)
and
latest version
latest version
ac95646d
24 commits,
Mar 10, 2024
17 files
+
448
−
121
Inline
Compare changes
Side-by-side
Inline
Show whitespace changes
Show one file at a time
Files
17
src/main/java/nl/tudelft/submit/controller/EditionController.java
+
3
−
2
View file @ ac95646d
Edit in single-file editor
Open in Web IDE
Show full file
@@ -417,7 +417,7 @@ public class EditionController {
*/
@Validated
@PostMapping
(
"/{id}/members/add"
)
@PreAuthorize
(
"@authorizationService.canAddMemberToEdition(#id, #user.
getU
sername
()
)"
)
@PreAuthorize
(
"@authorizationService.canAddMemberToEdition(#id, #user.
u
sername
, #user.role
)"
)
public
String
addMember
(
@PathVariable
Long
id
,
@ModelAttribute
(
"addMember"
)
AddMemberDTO
user
)
{
Long
personId
=
personService
.
getPersonByUsername
(
user
.
getUsername
()).
getId
();
@@ -556,7 +556,8 @@ public class EditionController {
@ModelAttribute
(
"participantImport"
)
EditionParticipantImportDTO
participantImport
)
throws
IOException
,
CsvValidationException
{
editionService
.
importParticipants
(
id
,
new
InputStreamReader
(
file
.
getInputStream
(),
StandardCharsets
.
UTF_8
),
participantImport
);
new
InputStreamReader
(
file
.
getInputStream
(),
StandardCharsets
.
UTF_8
),
participantImport
,
authorizationService
.
getRoleInEdition
(
id
)
==
RoleDetailsDTO
.
TypeEnum
.
TEACHER
);
return
"redirect:/edition/{id}/{fromPage}"
;
}
Loading