From fcb48ac71a2464943cd5bfba1739a8efa123ed37 Mon Sep 17 00:00:00 2001 From: LeoMoulin Date: Mon, 22 Apr 2024 00:39:17 +0200 Subject: [PATCH] Fixing some little bugs and details --- .../main/java/ovh/herisson/Clyde/EndPoints/UserController.java | 2 +- frontend/src/Apps/Inscription/CourseList.vue | 2 +- frontend/src/Apps/Inscription/ManageRequests.vue | 2 +- frontend/src/Apps/Profil.vue | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/backend/src/main/java/ovh/herisson/Clyde/EndPoints/UserController.java b/backend/src/main/java/ovh/herisson/Clyde/EndPoints/UserController.java index 1292ad1..15f9cee 100644 --- a/backend/src/main/java/ovh/herisson/Clyde/EndPoints/UserController.java +++ b/backend/src/main/java/ovh/herisson/Clyde/EndPoints/UserController.java @@ -44,7 +44,7 @@ public class UserController { @GetMapping("/user/{id}") public ResponseEntity> getUserById(@RequestHeader("Authorization") String token, @PathVariable Long id){ - if (authServ.isNotIn(new Role[]{Role.Admin,Role.Secretary,Role.InscriptionService},token)) + if (authServ.isNotIn(new Role[]{Role.Admin,Role.Secretary,Role.InscriptionService, Role.Teacher},token)) return new UnauthorizedResponse<>(null); return new ResponseEntity<>(ProtectionService.userWithoutPassword(userService.getUserById(id)), HttpStatus.OK); diff --git a/frontend/src/Apps/Inscription/CourseList.vue b/frontend/src/Apps/Inscription/CourseList.vue index 168aa14..8fcf0cb 100644 --- a/frontend/src/Apps/Inscription/CourseList.vue +++ b/frontend/src/Apps/Inscription/CourseList.vue @@ -80,7 +80,7 @@ function isExempted(course){
- +
diff --git a/frontend/src/Apps/Inscription/ManageRequests.vue b/frontend/src/Apps/Inscription/ManageRequests.vue index a2cccf1..342cc93 100644 --- a/frontend/src/Apps/Inscription/ManageRequests.vue +++ b/frontend/src/Apps/Inscription/ManageRequests.vue @@ -115,7 +115,7 @@
{{item.user.firstName}}
{{item.user.lastName}}
{{ i18n("approval")}}{{item.state}}
-
{{ i18n("teacherapproval") }} : {{item.teacherApprovalState}}
+
{{ i18n("teacherapproval") }} {{item.teacherApprovalState}}
diff --git a/frontend/src/Apps/Profil.vue b/frontend/src/Apps/Profil.vue index d9be6ff..06c5c11 100644 --- a/frontend/src/Apps/Profil.vue +++ b/frontend/src/Apps/Profil.vue @@ -253,7 +253,7 @@ {{ i18n("alreadypaid") }}
- +