Skip to content

Commit 25b2b7c

Browse files
committed
Deprecate /category/list and add redirect to /categories.
Addressed to #583 No functional changes.
1 parent 44c3e73 commit 25b2b7c

File tree

3 files changed

+16
-5
lines changed

3 files changed

+16
-5
lines changed

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

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ public final class Url {
6060
public static final String SUGGEST_SERIES_COUNTRY = "/suggest/series_country";
6161

6262
public static final String ADD_CATEGORY_PAGE = "/category/add";
63-
public static final String LIST_CATEGORIES_PAGE = "/category/list";
63+
public static final String GET_CATEGORIES_PAGE = "/categories";
6464
public static final String INFO_CATEGORY_PAGE = "/category/{slug}";
6565

6666
public static final String ADD_COUNTRY_PAGE = "/country/add";
@@ -80,6 +80,7 @@ public final class Url {
8080

8181
// For backward compatibility
8282
public static final String ACTIVATE_ACCOUNT_PAGE_WITH_KEY = "/account/activate/key/{key}";
83+
public static final String LIST_CATEGORIES_PAGE = "/category/list";
8384
public static final String INFO_CATEGORY_BY_ID_PAGE = "/category/{id}/{slug}";
8485
public static final String INFO_COUNTRY_BY_ID_PAGE = "/country/{id}/{slug}";
8586
public static final String INFO_COLLECTION_BY_ID_PAGE = "/collection/{id}/{slug}";
@@ -144,7 +145,7 @@ public static Map<String, String> asMap(boolean production) {
144145
map.put("INFO_COLLECTION_PAGE", INFO_COLLECTION_PAGE);
145146
map.put("INFO_COUNTRY_PAGE", INFO_COUNTRY_PAGE);
146147
map.put("INFO_SERIES_PAGE", INFO_SERIES_PAGE);
147-
map.put("LIST_CATEGORIES_PAGE", LIST_CATEGORIES_PAGE);
148+
map.put("GET_CATEGORIES_PAGE", GET_CATEGORIES_PAGE);
148149
map.put("LIST_COUNTRIES_PAGE", LIST_COUNTRIES_PAGE);
149150
map.put("LIST_IMPORT_REQUESTS_PAGE", LIST_IMPORT_REQUESTS_PAGE);
150151
map.put("LOGIN_PAGE", LOGIN_PAGE);

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

Lines changed: 12 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -135,12 +135,22 @@ public View showInfoById(
135135
return view;
136136
}
137137

138-
@GetMapping(Url.LIST_CATEGORIES_PAGE)
139-
public void list(Model model, Locale userLocale) {
138+
@GetMapping(Url.GET_CATEGORIES_PAGE)
139+
public String showCategories(Model model, Locale userLocale) {
140140
String lang = LocaleUtils.getLanguageOrNull(userLocale);
141141
List<LinkEntityDto> categories = categoryService.findAllAsLinkEntities(lang);
142142

143143
model.addAttribute("categories", categories);
144+
145+
return "category/list";
146+
}
147+
148+
@GetMapping(Url.LIST_CATEGORIES_PAGE)
149+
public View list() {
150+
RedirectView view = new RedirectView();
151+
view.setStatusCode(HttpStatus.MOVED_PERMANENTLY);
152+
view.setUrl(Url.GET_CATEGORIES_PAGE);
153+
return view;
144154
}
145155

146156
}

src/main/webapp/WEB-INF/views/site/index.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@
6565
<p th:text="|#{t_you_may}:|">You may:</p>
6666
<ul>
6767
<li togglz:active="LIST_CATEGORIES">
68-
<a th:href="@{${LIST_CATEGORIES_PAGE}}" th:text="#{t_show_categories_list}" href="../category/list.html">show list of categories</a>
68+
<a th:href="@{${GET_CATEGORIES_PAGE}}" th:text="#{t_show_categories_list}" href="../category/list.html">show list of categories</a>
6969
</li>
7070
<li togglz:active="LIST_COUNTRIES">
7171
<a th:href="@{${LIST_COUNTRIES_PAGE}}" th:text="#{t_show_countries_list}" href="../country/list.html">show list of countries</a>

0 commit comments

Comments
 (0)