Merge branch 'develop' into frontend/timo
This commit is contained in:
commit
53e3005dc9
@ -706,6 +706,8 @@ public class Controller {
|
||||
// verlässt team
|
||||
user_info.setTeam(null);
|
||||
|
||||
user_infoRepository.save(user_info);
|
||||
|
||||
//int i = 0;
|
||||
// zählt teammitglieder
|
||||
List<User_Info> user_infos = user_infoRepository.findByTeam(team);
|
||||
@ -720,8 +722,6 @@ public class Controller {
|
||||
teamRepository.delete(team);
|
||||
}
|
||||
|
||||
user_infoRepository.save(user_info);
|
||||
|
||||
return ResponseEntity.status(200).body("Ok");
|
||||
}
|
||||
|
||||
|
||||
Loading…
Reference in New Issue
Block a user