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

Merge pull request #133 from hhu-propra2/fixNoAccessPrivateGroupExeption

Browse Source 
removed html page for the exception
This commit is contained in:
AndiBuls
2020-03-25 14:08:47 +01:00
committed by GitHub
parent cf685fb6ff 062a0505be
commit 0e7f1d6865
2 changed files with 3 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/main/java/mops/gruppen2/controller/WebController.java
View File

@ -163,7 +163,7 @@ public class WebController {
Group parent = new Group(); Group parent = new Group();
if (!group.getMembers().contains(user)) { if (!group.getMembers().contains(user)) {
if (group.getVisibility() == Visibility.PRIVATE) { if (group.getVisibility() == Visibility.PRIVATE) {
return "privateGroupNoMember"; throw new NoAccessException("Die Gruppe ist privat");
} }
model.addAttribute("group", group); model.addAttribute("group", group);
model.addAttribute("parentId", parentId); model.addAttribute("parentId", parentId);
@ -226,7 +226,7 @@ public class WebController {
if (!group.getMembers().contains(user)) { if (!group.getMembers().contains(user)) {
if (group.getVisibility() == Visibility.PRIVATE) { if (group.getVisibility() == Visibility.PRIVATE) {
return "privateGroupNoMember"; throw new NoAccessException("Die Gruppe ist privat");
} }
model.addAttribute("group", group); model.addAttribute("group", group);
model.addAttribute("parentId", parentId); model.addAttribute("parentId", parentId);
@ -358,7 +358,7 @@ public class WebController {
return "redirect:/details/"; return "redirect:/details/";
} }
} else { } else {
return "privateGroupNoMember"; throw new NoAccessException("Die Gruppe ist privat");
} }
} }

26
src/main/resources/templates/privateGroupNoMember.html
View File

@ -1,26 +0,0 @@
<!DOCTYPE html>
<html lang="en" xmlns:th="http://www.thymeleaf.org">
<head>
<meta charset="utf-8">
<meta content="width=device-width, initial-scale=1, shrink-to-fit=no" name="viewport">
<link crossorigin="anonymous" href="https://maxcdn.bootstrapcdn.com/bootstrap/4.0.0/css/bootstrap.min.css"
integrity="sha384-Gn5384xqQ1aoWXA+058RXPxPg6fy4IWvTNh0E263XmFcJlSAwiGgFAW/dAiS6JXm" rel="stylesheet">
<meta charset="UTF-8">
<title>Seite nicht gefunden</title>
</head>
<body>
<div class="mx-auto" style="vertical-align: border-radius: 5px; center; horiz-align: center; top: 50%; left: 50%;">
<div class="jumbotron" style="background: aliceblue">
<div class="container">
<h1 class="display-3">Kein Zugriff auf die Gruppe</h1>
<p class="lead">Sorry, du hast keine Berechtigung auf diese Funktionen der Gruppe zuzugreifen</p><br>
</div>
</div>
<div class="container">
<p><a class="btn btn-primary btn-lg" href="#" onclick="window.history.back(-1);return false;" role="button">Zurück</a>
</p>
</div>
</div>
</body>
</html>