Merge branch 'develop' into frontend/timo

This commit is contained in:
Timo Volkmann 2019-05-13 12:29:58 +02:00
commit 53e3005dc9

View File

@ -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");
}