rename templates
This commit is contained in:
@ -47,7 +47,7 @@ public class GroupCreationController {
|
|||||||
|
|
||||||
model.addAttribute("lectures", projectionService.projectLectures());
|
model.addAttribute("lectures", projectionService.projectLectures());
|
||||||
|
|
||||||
return "createOrga";
|
return "create_orga";
|
||||||
}
|
}
|
||||||
|
|
||||||
@RolesAllowed("ROLE_orga")
|
@RolesAllowed("ROLE_orga")
|
||||||
@ -83,7 +83,7 @@ public class GroupCreationController {
|
|||||||
|
|
||||||
model.addAttribute("lectures", projectionService.projectLectures());
|
model.addAttribute("lectures", projectionService.projectLectures());
|
||||||
|
|
||||||
return "createStudent";
|
return "create_student";
|
||||||
}
|
}
|
||||||
|
|
||||||
@RolesAllowed("ROLE_studentin")
|
@RolesAllowed("ROLE_studentin")
|
||||||
|
|||||||
@ -67,10 +67,10 @@ public class GroupDetailsController {
|
|||||||
|
|
||||||
// Detailseite für nicht-Mitglieder
|
// Detailseite für nicht-Mitglieder
|
||||||
if (!ValidationService.checkIfMember(group, user)) {
|
if (!ValidationService.checkIfMember(group, user)) {
|
||||||
return "detailsNoMember";
|
return "details_nomember";
|
||||||
}
|
}
|
||||||
|
|
||||||
return "detailsMember";
|
return "details_member";
|
||||||
}
|
}
|
||||||
|
|
||||||
@RolesAllowed({"ROLE_orga", "ROLE_studentin"})
|
@RolesAllowed({"ROLE_orga", "ROLE_studentin"})
|
||||||
@ -128,7 +128,7 @@ public class GroupDetailsController {
|
|||||||
|
|
||||||
model.addAttribute("group", group);
|
model.addAttribute("group", group);
|
||||||
|
|
||||||
return "changeMetadata";
|
return "meta";
|
||||||
}
|
}
|
||||||
|
|
||||||
@RolesAllowed({"ROLE_orga", "ROLE_studentin"})
|
@RolesAllowed({"ROLE_orga", "ROLE_studentin"})
|
||||||
@ -161,7 +161,7 @@ public class GroupDetailsController {
|
|||||||
|
|
||||||
model.addAttribute("group", group);
|
model.addAttribute("group", group);
|
||||||
|
|
||||||
return "editMembers";
|
return "members";
|
||||||
}
|
}
|
||||||
|
|
||||||
@RolesAllowed({"ROLE_orga", "ROLE_studentin"})
|
@RolesAllowed({"ROLE_orga", "ROLE_studentin"})
|
||||||
|
|||||||
@ -24,6 +24,7 @@ public class ModelAttributeControllerAdvice {
|
|||||||
model.addAttribute("user", new User(token));
|
model.addAttribute("user", new User(token));
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// Add enums
|
||||||
model.addAttribute("member", Role.MEMBER);
|
model.addAttribute("member", Role.MEMBER);
|
||||||
model.addAttribute("admin", Role.ADMIN);
|
model.addAttribute("admin", Role.ADMIN);
|
||||||
model.addAttribute("public", Visibility.PUBLIC);
|
model.addAttribute("public", Visibility.PUBLIC);
|
||||||
|
|||||||
@ -83,6 +83,6 @@ public class SearchAndInviteController {
|
|||||||
return "redirect:/gruppen2/details/" + group.getId();
|
return "redirect:/gruppen2/details/" + group.getId();
|
||||||
}
|
}
|
||||||
|
|
||||||
return "joinprivate";
|
return "join";
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user