Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in
Toggle navigation
Menu
Open sidebar
Samuel Dudík
PA165 Winery Management System
Commits
4187d534
Commit
4187d534
authored
May 18, 2022
by
Jakub Balga
Browse files
Merge branch 'remaining' into 'main'
Titles See merge request
!46
parents
6c163c7e
20409cd9
Pipeline
#141124
passed with stages
in 2 minutes and 35 seconds
Changes
4
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
winery/webapp/src/main/java/cz/muni/fi/pa165/winery/webapp/controllers/HarvestController.java
View file @
4187d534
...
...
@@ -113,6 +113,7 @@ public class HarvestController extends ControllerBase {
initializeViewModel
(
viewModel
);
viewModel
.
setSuccess
(
true
);
viewModel
.
setTitle
(
"Harvests"
);
return
view
(
viewModel
);
}
...
...
winery/webapp/src/main/java/cz/muni/fi/pa165/winery/webapp/controllers/ProductReviewController.java
View file @
4187d534
...
...
@@ -68,6 +68,7 @@ public class ProductReviewController extends ControllerBase{
viewModel
.
setWineBottleNameLookup
(
bottleNames
);
viewModel
.
setUserFirstNameLookup
(
userFirstNames
);
viewModel
.
setUserLastNameLookup
(
userLastNames
);
viewModel
.
setTitle
(
"Product reviews"
);
return
view
(
viewModel
);
}
...
...
winery/webapp/src/main/java/cz/muni/fi/pa165/winery/webapp/controllers/WineBottleController.java
View file @
4187d534
...
...
@@ -62,6 +62,7 @@ public class WineBottleController extends ControllerBase {
viewModel
.
setWinebottles
(
bottles
);
viewModel
.
setWineTypeNameLookup
(
typeNames
);
viewModel
.
setGrapeNameLookup
(
grapeNames
);
viewModel
.
setTitle
(
"Products"
);
return
view
(
viewModel
);
}
...
...
winery/webapp/src/main/java/cz/muni/fi/pa165/winery/webapp/controllers/WineTypeController.java
View file @
4187d534
...
...
@@ -50,6 +50,7 @@ public class WineTypeController extends ControllerBase {
viewModel
.
setWinetypes
(
types
);
viewModel
.
setGrapeNameLookup
(
grapeNames
);
viewModel
.
setTitle
(
"Wine types"
);
return
view
(
viewModel
);
}
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment