Skip to content

Commit 9cd879c

Browse files
phasenraum2010phasenraum2010
committed
fixed #2 
1 parent 12af7cd commit 9cd879c

File tree

4 files changed

+115
-2
lines changed

4 files changed

+115
-2
lines changed

‎src/main/java/org/woehlke/beachbox/web/VinylController.java‎

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -149,6 +149,15 @@ public String newPost(@Valid Vinyl vinyl,Model model){
149149

150150
@RequestMapping(value = "/delete/{id}", method = RequestMethod.GET)
151151
public String deleteGet(@PathVariable long id, Model model){
152+
Vinyl vinyl = vinylService.findById(id);
153+
model.addAttribute("vinyl",vinyl);
154+
model.addAttribute("rubrik", Rubrik.values());
155+
model.addAttribute("tontraeger", Tontraeger.values());
156+
return "delete";
157+
}
158+
159+
@RequestMapping(value = "/delete/{id}", method = RequestMethod.POST)
160+
public String deletePost(@PathVariable long id, Vinyl vinyl, Model model){
152161
vinylService.deleteById(id);
153162
String pageInfo = "";
154163
if(model.containsAttribute("searchItem")) {

‎src/main/webapp/WEB-INF/views/delete.jsp‎

Lines changed: 104 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,104 @@
1+
<%@ include file="/WEB-INF/views/includes/taglibs.jsp"%>
2+
<!DOCTYPE html>
3+
<html lang="de">
4+
<head>
5+
<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
6+
<title>BeachBox</title>
7+
<!-- Bootstrap -->
8+
<link href="../webjars/bootstrap/3.1.1/css/bootstrap.min.css" rel="stylesheet" />
9+
<!-- Optional theme -->
10+
<link rel="stylesheet" href="../webjars/bootstrap/3.1.1/css/bootstrap-theme.min.css" />
11+
<!-- jQuery (necessary for Bootstrap's JavaScript plugins) -->
12+
<script type="text/javascript" src="../webjars/jquery/2.1.0-2/jquery.js"></script>
13+
<!-- Include all compiled plugins (below), or include individual files as needed -->
14+
<script type="text/javascript" src="../webjars/bootstrap/3.1.1/js/bootstrap.min.js"></script>
15+
</head>
16+
<body>
17+
<div class="container">
18+
<h1>BeachBox</h1>
19+
<p>Diesen Eintrag wirklich l&ouml;schen?</p>
20+
<form:form id="formId" commandName="vinyl" method="post"
21+
class="form-horizontal">
22+
<div class="input-group">
23+
<form:label path="rubrik" class="control-label">Rubrik</form:label>
24+
<div class="controls">
25+
<form:select path="rubrik">
26+
<form:options items="${rubrik}"/>
27+
</form:select>
28+
</div>
29+
<form:errors path="rubrik" class="alert alert-danger"/>
30+
</div>
31+
<div class="input-group">
32+
<form:label path="tontraeger" class="control-label">Tontraeger</form:label>
33+
<div class="controls">
34+
<form:select path="tontraeger">
35+
<form:options items="${tontraeger}" />
36+
</form:select>
37+
</div>
38+
<form:errors path="tontraeger" class="alert alert-danger"/>
39+
</div>
40+
41+
<div class="input-group">
42+
<form:label path="interpret" class="control-label">Interpret</form:label>
43+
<div class="controls">
44+
<form:input path="interpret" class="form-control" />
45+
</div>
46+
<form:errors path="interpret" class="alert alert-danger"/>
47+
</div>
48+
<div class="input-group">
49+
<form:label path="song" class="control-label">Song</form:label>
50+
<div class="controls">
51+
<form:input path="song" class="form-control" />
52+
</div>
53+
<form:errors path="song" class="alert alert-danger"/>
54+
</div>
55+
<div class="input-group">
56+
<form:label path="name" class="control-label">Name</form:label>
57+
<div class="controls">
58+
<form:input path="name" class="form-control" />
59+
</div>
60+
<form:errors path="name" class="alert alert-danger"/>
61+
</div>
62+
<div class="input-group">
63+
<form:label path="seite" class="control-label">Seite</form:label>
64+
<div class="controls">
65+
<form:input path="seite" class="form-control" />
66+
</div>
67+
<form:errors path="seite" class="alert alert-danger"/>
68+
</div>
69+
<div class="input-group">
70+
<form:label path="jahr" class="control-label">Jahr</form:label>
71+
<div class="controls">
72+
<form:input path="jahr" class="form-control" />
73+
</div>
74+
<form:errors path="jahr" class="alert alert-danger"/>
75+
</div>
76+
<div class="input-group">
77+
<form:label path="genre" class="control-label">Genre</form:label>
78+
<div class="controls">
79+
<form:input path="genre" class="form-control" />
80+
</div>
81+
<form:errors path="genre" class="alert alert-danger"/>
82+
</div>
83+
<div class="input-group">
84+
<form:label path="label" class="control-label">Label</form:label>
85+
<div class="controls">
86+
<form:input path="label" class="form-control" />
87+
</div>
88+
<form:errors path="label" class="alert alert-danger"/>
89+
</div>
90+
<div class="input-group">
91+
<form:label path="bemerkung" class="control-label">Bemerkung</form:label>
92+
<div class="controls">
93+
<form:input path="bemerkung" class="form-control" />
94+
</div>
95+
<form:errors path="bemerkung" class="alert alert-danger"/>
96+
</div>
97+
<div class="controls">
98+
<form:hidden path="id"/>
99+
<input id="deleteVinyl" type="submit" value="L&ouml;schen" class="btn btn-danger" />
100+
</div>
101+
</form:form>
102+
</div>
103+
</body>
104+
</html>

‎src/main/webapp/WEB-INF/views/edit.jsp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -95,7 +95,7 @@
9595
</div>
9696
<div class="controls">
9797
<form:hidden path="id"/>
98-
<input id="createNewVinyl" type="submit" value="Speichern" class="btn btn-primary" />
98+
<input id="createNewVinyl" type="submit" value="Speichern" class="btn btn-warning" />
9999
</div>
100100
</form:form>
101101
</div>

‎src/main/webapp/WEB-INF/views/new.jsp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -95,7 +95,7 @@
9595
</div>
9696
<div class="controls">
9797
<form:hidden path="id"/>
98-
<input id="createNewVinyl" type="submit" value="Speichern" class="btn btn-primary" />
98+
<input id="createNewVinyl" type="submit" value="Speichern" class="btn btn-success" />
9999
</div>
100100
</form:form>
101101
</div>

0 commit comments

Comments
 (0)