Merge master into my branch
This commit is contained in:
		| @ -117,7 +117,7 @@ public class CurriculumController { | ||||
|     } | ||||
|  | ||||
|     @GetMapping("/externalcurriculum/{userId}") | ||||
|     public ResponseEntity<Map<String,Object>> getStudentsExternalCursus(@RequestHeader("Authorization") String token, @PathVariable String userId){ | ||||
|     public ResponseEntity<Map<String,Object>> getStudentsExternalCurriculum(@RequestHeader("Authorization") String token, @PathVariable String userId){ | ||||
|         if (authServ.isNotIn(new Role[]{Role.Secretary,Role.Admin, Role.Teacher},token)) | ||||
|             return new UnauthorizedResponse<>(null); | ||||
|  | ||||
|  | ||||
		Reference in New Issue
	
	Block a user