Fix merge conflicts

ls1intum · Dec 28, 2024 · 719e7c9 · 719e7c9
1 parent cb3461b
commit 719e7c9
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 5 deletions.
diff --git a/client/package-lock.json b/client/package-lock.json
diff --git a/server/src/main/java/thesistrack/ls1/controller/ThesisController.java b/server/src/main/java/thesistrack/ls1/controller/ThesisController.java
@@ -207,7 +207,7 @@ public ResponseEntity<ThesisDto> updateThesisInfo(
                 RequestValidator.validateNotNull(payload.secondaryTitles())
         );
 
-        return ResponseEntity.ok(ThesisDto.fromThesisEntity(thesis, thesis.hasAdvisorAccess(authenticatedUser)));
+        return ResponseEntity.ok(ThesisDto.fromThesisEntity(thesis, thesis.hasAdvisorAccess(authenticatedUser), thesis.hasStudentAccess(authenticatedUser)));
     }
 
     @PutMapping("/{thesisId}/credits")
@@ -228,7 +228,7 @@ public ResponseEntity<ThesisDto> updateThesisCredits(
                 payload.credits()
         );
 
-        return ResponseEntity.ok(ThesisDto.fromThesisEntity(thesis, thesis.hasAdvisorAccess(authenticatedUser)));
+        return ResponseEntity.ok(ThesisDto.fromThesisEntity(thesis, thesis.hasAdvisorAccess(authenticatedUser), thesis.hasStudentAccess(authenticatedUser)));
     }
 
     /* FEEDBACK ENDPOINTS */