country/info.html: put to context separate variables instead of single object.

php-coder · php-coder · commit 4e865259ab2e · 2015-12-07T21:50:46.000+01:00
Make view not aware of structure and type of the object (entity/dto/etc) and also allow to easy determine where and what methods of the object were used. Related to #120
diff --git a/src/main/java/ru/mystamps/web/controller/CountryController.java b/src/main/java/ru/mystamps/web/controller/CountryController.java
@@ -100,7 +100,9 @@ public String showInfo(
 			return null;
 		}
 		
-		model.addAttribute("country", country);
+		model.addAttribute("countryId", country.getId());
+		model.addAttribute("countrySlug", country.getSlug());
+		model.addAttribute("countryName", LocaleUtils.getLocalizedName(userLocale, country));
 		
 		String lang = LocaleUtils.getLanguageOrNull(userLocale);
 		Integer countryId = country.getId();
diff --git a/src/main/webapp/WEB-INF/views/country/info.html b/src/main/webapp/WEB-INF/views/country/info.html
@@ -12,7 +12,7 @@
 		<link rel="stylesheet" href="http://maxcdn.bootstrapcdn.com/bootstrap/3.3.6/css/bootstrap.min.css" th:href="${BOOTSTRAP_CSS}" />
 		<link rel="stylesheet" href="https://cdn.rawgit.com/usrz/bootstrap-languages/3ac2a3d2b27ac43a471cd99e79d378a03b2c6b5f/languages.min.css" th:href="${BOOTSTRAP_LANGUAGE}" />
 		<link rel="stylesheet" href="../../static/styles/main.css" th:href="${MAIN_CSS}" />
-		<link rel="canonical" href="" th:href="@{${PUBLIC_URL} + ${INFO_COUNTRY_PAGE}(id=${country.id},slug=${country.slug})}" />
+		<link rel="canonical" href="" th:href="@{${PUBLIC_URL} + ${INFO_COUNTRY_PAGE}(id=${countryId},slug=${countrySlug})}" />
 	</head>
 	<body>
 		<div class="container-fluid">
@@ -87,13 +87,13 @@
 			</div>
 			<div class="row">
 				<div id="content" class="col-sm-12">
-					<h3 th:text="${country.getLocalizedName(#locale)}">
+					<h3 th:text="${countryName}">
 						Italy
 					</h3>
 					
 					<!--/*/
 					<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=${country.id})})}">
+						<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})})}">
 							Country has been added.<br />
 							Now you could <a href="../series/add.html" class="alert-link">proceed with creating series</a>.
 						</div>

Original file line number	Diff line number	Diff line change
`@@ -100,7 +100,9 @@ public String showInfo(`
`100`	`100`	`return null;`
`101`	`101`	`}`
`102`	`102`
`103`		`- model.addAttribute("country", country);`
	`103`	`+ model.addAttribute("countryId", country.getId());`
	`104`	`+ model.addAttribute("countrySlug", country.getSlug());`
	`105`	`+ model.addAttribute("countryName", LocaleUtils.getLocalizedName(userLocale, country));`
`104`	`106`
`105`	`107`	`String lang = LocaleUtils.getLanguageOrNull(userLocale);`
`106`	`108`	`Integer countryId = country.getId();`