@@ -123,12 +123,6 @@ public Map<Integer, Integer> getYears() {
123
123
return YEARS ;
124
124
}
125
125
126
- @ ModelAttribute ("categories" )
127
- public List <FirstLevelCategoryDto > getCategories (Locale userLocale ) {
128
- String lang = LocaleUtils .getLanguageOrNull (userLocale );
129
- return categoryService .findFirstLevelCategories (lang );
130
- }
131
-
132
126
@ ModelAttribute ("countries" )
133
127
public List <LinkEntityDto > getCountries (Locale userLocale ) {
134
128
String lang = LocaleUtils .getLanguageOrNull (userLocale );
@@ -138,7 +132,14 @@ public List<LinkEntityDto> getCountries(Locale userLocale) {
138
132
@ GetMapping (Url .ADD_SERIES_PAGE )
139
133
public AddSeriesForm showForm (
140
134
@ 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 );
142
143
143
144
AddSeriesForm addSeriesForm = new AddSeriesForm ();
144
145
addSeriesForm .setPerforated (true );
@@ -188,9 +189,16 @@ public String processInput(
188
189
AddSeriesForm .ReleaseDateChecks .class ,
189
190
AddSeriesForm .ImageChecks .class }) AddSeriesForm form ,
190
191
BindingResult result ,
191
- @ CurrentUser Integer currentUserId ) {
192
+ @ CurrentUser Integer currentUserId ,
193
+ Locale userLocale ,
194
+ Model model ) {
192
195
193
196
if (result .hasErrors ()) {
197
+ String lang = LocaleUtils .getLanguageOrNull (userLocale );
198
+
199
+ List <FirstLevelCategoryDto > categories = categoryService .findFirstLevelCategories (lang );
200
+ model .addAttribute ("categories" , categories );
201
+
194
202
// don't try to re-display file upload field
195
203
form .setImage (null );
196
204
return null ;
0 commit comments