/series/add: fix pre-population of country with special URL.

Fix #438

Author: php-coder

src/main/java/ru/mystamps/web/Url.java

@@ -52,7 +52,7 @@ public final class Url {
 	// CheckStyle: ignore LineLength for next 3 lines
 	public static final String ADD_SERIES_PAGE               = "/series/add";
 	public static final String ADD_SERIES_WITH_CATEGORY_PAGE = "/series/add/category/{id}";
-	public static final String ADD_SERIES_WITH_COUNTRY_PAGE  = "/series/add/country/{id}";
+	public static final String ADD_SERIES_WITH_COUNTRY_PAGE  = "/series/add/country/{slug}";
 	public static final String INFO_SERIES_PAGE              = "/series/{id}";
 	public static final String ADD_IMAGE_SERIES_PAGE         = "/series/{id}/image";
 	public static final String SEARCH_SERIES_BY_CATALOG      = "/series/search/by_catalog";

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

@@ -113,7 +113,6 @@ public String showInfoBySlug(
 		String lang = LocaleUtils.getLanguageOrNull(userLocale);
 		List<SeriesInfoDto> series = seriesService.findByCountryId(id, lang);
 
-		model.addAttribute("countryId", id);
 		model.addAttribute("countrySlug", slug);
 		model.addAttribute("countryName", name);
 		model.addAttribute("seriesOfCountry", series);

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

@@ -144,7 +144,7 @@ public String showFormWithCategory(
 
 	@RequestMapping(Url.ADD_SERIES_WITH_COUNTRY_PAGE)
 	public String showFormWithCountry(
-		@Country @PathVariable("id") LinkEntityDto country,
+		@Country @PathVariable("slug") LinkEntityDto country,
 		Model model) {
 
 		AddSeriesForm form = new AddSeriesForm();

src/main/webapp/WEB-INF/views/country/info.html

@@ -95,7 +95,7 @@ <h3 th:text="${#strings.capitalize(header)}">
 
 					<!--/*/
 					<div class="row" th:if="${justAddedCountry}">
-						<div class="alert alert-success text-center col-sm-4 col-sm-offset-4" th:utext="#{t_country_just_added(@{${ADD_SERIES_WITH_COUNTRY_PAGE}(id=${countryId})})}">
+						<div class="alert alert-success text-center col-sm-4 col-sm-offset-4" th:utext="#{t_country_just_added(@{${ADD_SERIES_WITH_COUNTRY_PAGE}(slug=${countrySlug})})}">
 							Country has been added.<br />
 							Now you could <a href="../series/add.html" class="alert-link">proceed with creating series</a>.
 						</div>