File tree 4 files changed +13
-1
lines changed
java/ru/mystamps/web/feature/collection
resources/ru/mystamps/i18n
webapp/WEB-INF/views/collection
4 files changed +13
-1
lines changed Original file line number Diff line number Diff line change @@ -45,7 +45,6 @@ public class CollectionController {
45
45
private final CountryService countryService ;
46
46
private final MessageSource messageSource ;
47
47
48
- // @todo #884 /collection/{slug}: add a link to collection estimation page
49
48
@ GetMapping (Url .INFO_COLLECTION_PAGE )
50
49
public String showInfoBySlug (
51
50
@ PathVariable ("slug" ) String slug ,
Original file line number Diff line number Diff line change @@ -189,6 +189,8 @@ t_in_collection = In this collection
189
189
t_stamps_by_categories = Stamps by categories
190
190
t_stamps_by_countries = Stamps by countries
191
191
t_unspecified = Unspecified
192
+ t_cost = The cost
193
+ t_how_much = how much?
192
194
193
195
# collection/estimation.html
194
196
t_series = Series
Original file line number Diff line number Diff line change @@ -188,6 +188,8 @@ t_in_collection = В этой коллекции
188
188
t_stamps_by_categories = Марки по категориям
189
189
t_stamps_by_countries = Марки по странам
190
190
t_unspecified = Не указана
191
+ t_cost = Стоимость
192
+ t_how_much = сколько?
191
193
192
194
# collection/estimation.html
193
195
t_series = Серия
Original file line number Diff line number Diff line change @@ -98,6 +98,15 @@ <h4 class="panel-title" th:text="#{t_in_collection}">In this collection</h4>
98
98
< p th:text ="|#{t_countries_amount}: ${countryCounter}| "> Amount of countries: 1</ p >
99
99
< p th:text ="|#{t_series_amount}: ${seriesCounter}| "> Amount of series: 3</ p >
100
100
< 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 >
101
110
</ div >
102
111
</ div >
103
112
</ div >
You can’t perform that action at this time.
0 commit comments