christoph/lecture-professional-software-development
1
Fork 0
Code Activity

Merge remote-tracking branch 'origin/master' into updateGroupsAPI

Browse Source 
# Conflicts:
#	src/main/java/mops/gruppen2/service/EventService.java
This commit is contained in:
LukasEttel
2020-03-13 13:52:53 +01:00
parent d1f296129d 9a802b2f85
commit b8fe1bf29a
11 changed files with 73 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/main/java/mops/gruppen2/domain/event/UpdateRoleEvent.java
View File

@ -15,7 +15,11 @@ public class UpdateRoleEvent extends Event {
public UpdateRoleEvent(Long event_id, Long group_id, String user_id, Role newRole) {
super(event_id, group_id, user_id);
this.newRole = newRole;
}
public UpdateRoleEvent(Long group_id, String user_id, Role newRole) {
super(group_id, user_id);
this.newRole = newRole;
}
}