Skip to content

Commit 56d7d24

Browse files
committed
WhenAnonymousUserOpenNotExistingSeriesPage: unbreak test.
Using method that requires permissions in @ModelAttribute made unavailable another page because @ModelAttribute got executed for all methods of controller. Correction for b7fe1da commit. Addressed to #434
1 parent 6bcc855 commit 56d7d24

File tree

1 file changed

+16
-8
lines changed

1 file changed

+16
-8
lines changed

src/main/java/ru/mystamps/web/controller/SeriesController.java

Lines changed: 16 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -123,12 +123,6 @@ public Map<Integer, Integer> getYears() {
123123
return YEARS;
124124
}
125125

126-
@ModelAttribute("categories")
127-
public List<FirstLevelCategoryDto> getCategories(Locale userLocale) {
128-
String lang = LocaleUtils.getLanguageOrNull(userLocale);
129-
return categoryService.findFirstLevelCategories(lang);
130-
}
131-
132126
@ModelAttribute("countries")
133127
public List<LinkEntityDto> getCountries(Locale userLocale) {
134128
String lang = LocaleUtils.getLanguageOrNull(userLocale);
@@ -138,7 +132,14 @@ public List<LinkEntityDto> getCountries(Locale userLocale) {
138132
@GetMapping(Url.ADD_SERIES_PAGE)
139133
public AddSeriesForm showForm(
140134
@Category @RequestParam(name = "category", required = false) LinkEntityDto category,
141-
@Country @RequestParam(name = "country", required = false) LinkEntityDto country) {
135+
@Country @RequestParam(name = "country", required = false) LinkEntityDto country,
136+
Model model,
137+
Locale userLocale) {
138+
139+
String lang = LocaleUtils.getLanguageOrNull(userLocale);
140+
141+
List<FirstLevelCategoryDto> categories = categoryService.findFirstLevelCategories(lang);
142+
model.addAttribute("categories", categories);
142143

143144
AddSeriesForm addSeriesForm = new AddSeriesForm();
144145
addSeriesForm.setPerforated(true);
@@ -188,9 +189,16 @@ public String processInput(
188189
AddSeriesForm.ReleaseDateChecks.class,
189190
AddSeriesForm.ImageChecks.class }) AddSeriesForm form,
190191
BindingResult result,
191-
@CurrentUser Integer currentUserId) {
192+
@CurrentUser Integer currentUserId,
193+
Locale userLocale,
194+
Model model) {
192195

193196
if (result.hasErrors()) {
197+
String lang = LocaleUtils.getLanguageOrNull(userLocale);
198+
199+
List<FirstLevelCategoryDto> categories = categoryService.findFirstLevelCategories(lang);
200+
model.addAttribute("categories", categories);
201+
194202
// don't try to re-display file upload field
195203
form.setImage(null);
196204
return null;

0 commit comments

Comments
 (0)