Compare commits
2 Commits
b382bf957f
...
2d8fcb4712
Author | SHA1 | Date | |
---|---|---|---|
2d8fcb4712 | |||
fcb48ac71a |
@ -44,7 +44,7 @@ public class UserController {
|
|||||||
@GetMapping("/user/{id}")
|
@GetMapping("/user/{id}")
|
||||||
public ResponseEntity<HashMap<String ,Object>> getUserById(@RequestHeader("Authorization") String token, @PathVariable Long id){
|
public ResponseEntity<HashMap<String ,Object>> 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 UnauthorizedResponse<>(null);
|
||||||
|
|
||||||
return new ResponseEntity<>(ProtectionService.userWithoutPassword(userService.getUserById(id)), HttpStatus.OK);
|
return new ResponseEntity<>(ProtectionService.userWithoutPassword(userService.getUserById(id)), HttpStatus.OK);
|
||||||
|
@ -80,7 +80,7 @@ function isExempted(course){
|
|||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
<div v-if="list === false">
|
<div v-if="list === false">
|
||||||
<button @click="list=!list;submitted=!submitted">{{ i18n("courses.back") }}</button>
|
<button @click="list=!list;submitted=false">{{ i18n("courses.back") }}</button>
|
||||||
</div>
|
</div>
|
||||||
</template>
|
</template>
|
||||||
|
|
||||||
|
@ -115,7 +115,7 @@
|
|||||||
<div class="studentfirstname">{{item.user.firstName}}</div>
|
<div class="studentfirstname">{{item.user.firstName}}</div>
|
||||||
<div class="studentlastname">{{item.user.lastName}}</div>
|
<div class="studentlastname">{{item.user.lastName}}</div>
|
||||||
<div class="reqState">{{ i18n("approval")}}{{item.state}}</div>
|
<div class="reqState">{{ i18n("approval")}}{{item.state}}</div>
|
||||||
<div class="teacherApproval">{{ i18n("teacherapproval") }} : {{item.teacherApprovalState}}</div>
|
<div class="teacherApproval">{{ i18n("teacherapproval") }} {{item.teacherApprovalState}}</div>
|
||||||
<div class="infos"><button @click="windowsState=5;targetId=item.id">{{ i18n("request.moreInfos") }}</button></div>
|
<div class="infos"><button @click="windowsState=5;targetId=item.id">{{ i18n("request.moreInfos") }}</button></div>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
@ -253,7 +253,7 @@
|
|||||||
{{ i18n("alreadypaid") }}
|
{{ i18n("alreadypaid") }}
|
||||||
</div>
|
</div>
|
||||||
<div>
|
<div>
|
||||||
<button @click="windowState=7" v-if="minerv.value.toPay <= 0">{{ i18n("askscholarship") }}</button>
|
<button @click="windowState=7" v-if="minerv.value.toPay >= 0">{{ i18n("askscholarship") }}</button>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
<div v-if="windowState === 5">
|
<div v-if="windowState === 5">
|
||||||
|
Loading…
Reference in New Issue
Block a user