Commit f0eafff3 authored by Ondřej Pavlica's avatar Ondřej Pavlica
Browse files

Merge branch 'main' of https://gitlab.fi.muni.cz/xdudik/pa165-winery

# Conflicts:
#	winery/webapp/src/main/java/cz/muni/fi/pa165/winery/webapp/models/grape/GrapeUpsertViewModel.java
#	winery/webapp/src/main/java/cz/muni/fi/pa165/winery/webapp/models/wineBottle/WineBottleUpsertViewModel.java
#	winery/webapp/src/main/java/cz/muni/fi/pa165/winery/webapp/models/wineType/WineTypeUpsertViewModel.java
parents d3857b9b bf355673
Pipeline #141201 passed with stages
in 2 minutes and 29 seconds
...@@ -54,6 +54,8 @@ public class HarvestController extends ControllerBase { ...@@ -54,6 +54,8 @@ public class HarvestController extends ControllerBase {
viewModel.setHarvests(harvests); viewModel.setHarvests(harvests);
viewModel.setGrapeNameLookup(grapeNames); viewModel.setGrapeNameLookup(grapeNames);
viewModel.setTitle("Harvests");
return view(viewModel); return view(viewModel);
} }
...@@ -113,7 +115,6 @@ public class HarvestController extends ControllerBase { ...@@ -113,7 +115,6 @@ public class HarvestController extends ControllerBase {
initializeViewModel(viewModel); initializeViewModel(viewModel);
viewModel.setSuccess(true); viewModel.setSuccess(true);
viewModel.setTitle("Harvests");
return view(viewModel); return view(viewModel);
} }
......
...@@ -10,7 +10,7 @@ ...@@ -10,7 +10,7 @@
<div class="container px-4 px-lg-5"> <div class="container px-4 px-lg-5">
<main role="main" class="pb-3"> <main role="main" class="pb-3">
<h1>Review - Add</h1> <h1>Review - Add</h1>
<a class="btn btn-secondary" th:href="@{/productreview}">Back</a> <a class="btn btn-secondary" href="javascript:history.go(-2)">Back</a>
<div th:if="${model.success}"> <div th:if="${model.success}">
<div class="alert alert-success" role="alert"> <div class="alert alert-success" role="alert">
...@@ -19,8 +19,8 @@ ...@@ -19,8 +19,8 @@
</div> </div>
<div th:if="${model.exists}"> <div th:if="${model.exists}">
<div class="alert alert-danger" role="alert"> <div class="alert alert-warning" role="alert">
You already created review for this product! You've already created review for this product!
</div> </div>
</div> </div>
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment