Pre-select category/country on create series page.

Author: php-coder

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

@@ -47,7 +47,10 @@ public final class Url {
 	public static final String ACTIVATE_ACCOUNT_PAGE = "/account/activate";
 	public static final String ACTIVATE_ACCOUNT_PAGE_WITH_KEY = "/account/activate/key/{key}";
 
+	// 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 INFO_SERIES_PAGE      = "/series/{id}";
 	public static final String ADD_IMAGE_SERIES_PAGE = "/series/{id}/image";
 
@@ -112,6 +115,8 @@ public static Map<String, String> asMap(boolean serveContentFromSingleHost) {
 		map.put("ACTIVATE_ACCOUNT_PAGE", ACTIVATE_ACCOUNT_PAGE);
 		map.put("REGISTRATION_PAGE", REGISTRATION_PAGE);
 		map.put("ADD_SERIES_PAGE", ADD_SERIES_PAGE);
+		map.put("ADD_SERIES_WITH_CATEGORY_PAGE", ADD_SERIES_WITH_CATEGORY_PAGE);
+		map.put("ADD_SERIES_WITH_COUNTRY_PAGE", ADD_SERIES_WITH_COUNTRY_PAGE);
 		map.put("INFO_SERIES_PAGE", INFO_SERIES_PAGE);
 		map.put("ADD_IMAGE_SERIES_PAGE", ADD_IMAGE_SERIES_PAGE);
 		map.put("ADD_CATEGORY_PAGE", ADD_CATEGORY_PAGE);

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

@@ -44,15 +44,17 @@
 import lombok.RequiredArgsConstructor;
 
 import ru.mystamps.web.Url;
+import ru.mystamps.web.entity.Category;
 import ru.mystamps.web.entity.Collection;
+import ru.mystamps.web.entity.Country;
+import ru.mystamps.web.entity.Series;
 import ru.mystamps.web.entity.User;
 import ru.mystamps.web.model.AddImageForm;
 import ru.mystamps.web.model.AddSeriesForm;
 import ru.mystamps.web.model.AddSeriesForm.ScottCatalogChecks;
 import ru.mystamps.web.model.AddSeriesForm.GibbonsCatalogChecks;
 import ru.mystamps.web.model.AddSeriesForm.MichelCatalogChecks;
 import ru.mystamps.web.model.AddSeriesForm.YvertCatalogChecks;
-import ru.mystamps.web.entity.Series;
 import ru.mystamps.web.service.CategoryService;
 import ru.mystamps.web.service.CollectionService;
 import ru.mystamps.web.service.CountryService;
@@ -120,6 +122,30 @@ public AddSeriesForm showForm() {
 		return addSeriesForm;
 	}
 
+	@RequestMapping(Url.ADD_SERIES_WITH_CATEGORY_PAGE)
+	public String showFormWithCategory(@PathVariable("id") Category category, Model model) {
+		
+		AddSeriesForm form = new AddSeriesForm();
+		form.setPerforated(true);
+		form.setCategory(category);
+		
+		model.addAttribute("addSeriesForm", form);
+		
+		return "series/add";
+	}
+	
+	@RequestMapping(Url.ADD_SERIES_WITH_COUNTRY_PAGE)
+	public String showFormWithCountry(@PathVariable("id") Country country, Model model) {
+		
+		AddSeriesForm form = new AddSeriesForm();
+		form.setPerforated(true);
+		form.setCountry(country);
+		
+		model.addAttribute("addSeriesForm", form);
+		
+		return "series/add";
+	}
+	
 	@RequestMapping(value = Url.ADD_SERIES_PAGE, method = RequestMethod.POST)
 	public String processInput(
 		@Validated({

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

@@ -57,7 +57,7 @@ <h3 th:text="${category.getLocalizedName(#locale)}">
 
 					<!--/*/
 					<div class="row" th:if="${justAddedCategory}">
-						<div class="alert alert-success text-center col-sm-4 col-sm-offset-4" th:utext="#{t_category_just_added(@{${ADD_SERIES_PAGE}})}">
+						<div class="alert alert-success text-center col-sm-4 col-sm-offset-4" th:utext="#{t_category_just_added(@{${ADD_SERIES_WITH_CATEGORY_PAGE}(id=${category.id})})}">
 							Category has been added.<br />
 							Now you could <a href="../series/add.html" class="alert-link">proceed with creating series</a>.
 						</div>

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

@@ -57,7 +57,7 @@ <h3 th:text="${country.getLocalizedName(#locale)}">
 
 					<!--/*/
 					<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_PAGE}})}">
+						<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=${country.id})})}">
 							Country has been added.<br />
 							Now you could <a href="../series/add.html" class="alert-link">proceed with creating series</a>.
 						</div>