Skip to content

Commit 0fd6de5

Browse files
committed
task(/collection/{slug}): add a link to collection estimation page.
Fix #892
1 parent 7726bba commit 0fd6de5

File tree

4 files changed

+13
-1
lines changed

4 files changed

+13
-1
lines changed

src/main/java/ru/mystamps/web/feature/collection/CollectionController.java

-1
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,6 @@ public class CollectionController {
4545
private final CountryService countryService;
4646
private final MessageSource messageSource;
4747

48-
// @todo #884 /collection/{slug}: add a link to collection estimation page
4948
@GetMapping(Url.INFO_COLLECTION_PAGE)
5049
public String showInfoBySlug(
5150
@PathVariable("slug") String slug,

src/main/resources/ru/mystamps/i18n/Messages.properties

+2
Original file line numberDiff line numberDiff line change
@@ -189,6 +189,8 @@ t_in_collection = In this collection
189189
t_stamps_by_categories = Stamps by categories
190190
t_stamps_by_countries = Stamps by countries
191191
t_unspecified = Unspecified
192+
t_cost = The cost
193+
t_how_much = how much?
192194

193195
# collection/estimation.html
194196
t_series = Series

src/main/resources/ru/mystamps/i18n/Messages_ru.properties

+2
Original file line numberDiff line numberDiff line change
@@ -188,6 +188,8 @@ t_in_collection = В этой коллекции
188188
t_stamps_by_categories = Марки по категориям
189189
t_stamps_by_countries = Марки по странам
190190
t_unspecified = Не указана
191+
t_cost = Стоимость
192+
t_how_much = сколько?
191193

192194
# collection/estimation.html
193195
t_series = Серия

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

+9
Original file line numberDiff line numberDiff line change
@@ -98,6 +98,15 @@ <h4 class="panel-title" th:text="#{t_in_collection}">In this collection</h4>
9898
<p th:text="|#{t_countries_amount}: ${countryCounter}|">Amount of countries: 1</p>
9999
<p th:text="|#{t_series_amount}: ${seriesCounter}|">Amount of series: 3</p>
100100
<p th:text="|#{t_stamps_amount}: ${stampsCounter}|">Amount of stamps: 34</p>
101+
<!--/* @todo #892 Add integration tests for showing a link to collection estimation page */-->
102+
<p sec:authorize="hasAuthority('ADD_SERIES_PRICE')">
103+
<span th:text="#{t_cost}">The cost</span>:
104+
<a href="estimation.html"
105+
th:href="@{${ESTIMATION_COLLECTION_PAGE}(slug=${slug})}"
106+
th:text="#{t_how_much}">
107+
how much?
108+
</a>
109+
</p>
101110
</div>
102111
</div>
103112
</div>

0 commit comments

Comments
 (0)