From 310dfdf5ed6d38bf97d7e6b61111619b50bdeabe Mon Sep 17 00:00:00 2001 From: Jake Potrebic Date: Tue, 25 Aug 2020 11:16:45 -0700 Subject: [PATCH] changed org to use z over s --- .../hangar/controller/OrgController.java | 18 +++++++++--------- .../io/papermc/hangar/util/RouteHelper.java | 12 ++++++------ .../papermc/hangar/util/RouteHelperTest.java | 2 +- 3 files changed, 16 insertions(+), 16 deletions(-) diff --git a/src/main/java/io/papermc/hangar/controller/OrgController.java b/src/main/java/io/papermc/hangar/controller/OrgController.java index 8151ee830..981ec0e83 100644 --- a/src/main/java/io/papermc/hangar/controller/OrgController.java +++ b/src/main/java/io/papermc/hangar/controller/OrgController.java @@ -47,13 +47,13 @@ public class OrgController extends HangarController { this.routeHelper = routeHelper; } - @RequestMapping("/organisations/invite/{id}/{status}") + @RequestMapping("/organizations/invite/{id}/{status}") public Object setInviteStatus(@PathVariable Object id, @PathVariable Object status) { return null; // TODO implement setInviteStatus request controller } @Secured("ROLE_USER") - @GetMapping("/organisations/new") + @GetMapping("/organizations/new") public ModelAndView showCreator(RedirectAttributes attributes, ModelMap modelMap) { if (orgService.getUserOwnedOrgs(userService.getCurrentUser().getId()).size() >= hangarConfig.org.getCreateLimit()) { AlertUtil.showAlert(attributes, AlertUtil.AlertType.ERROR, "error.org.createLimit", String.valueOf(hangarConfig.org.getCreateLimit())); @@ -63,7 +63,7 @@ public class OrgController extends HangarController { } @Secured("ROLE_USER") - @PostMapping(value = "/organisations/new", consumes = MediaType.APPLICATION_FORM_URLENCODED_VALUE) + @PostMapping(value = "/organizations/new", consumes = MediaType.APPLICATION_FORM_URLENCODED_VALUE) public ModelAndView create(@RequestParam String name, @RequestParam(required = false) List users, @RequestParam(required = false) List roles, RedirectAttributes attributes) { if (orgService.getUserOwnedOrgs(userService.getCurrentUser().getId()).size() >= hangarConfig.org.getCreateLimit()) { throw new ResponseStatusException(HttpStatus.BAD_REQUEST, "at create limit"); @@ -93,20 +93,20 @@ public class OrgController extends HangarController { } @Secured("ROLE_USER") - @RequestMapping("/organisations/{organisations}/settings/avatar") - public Object updateAvatar(@PathVariable Object organisations) { + @RequestMapping("/organizations/{organization}/settings/avatar") + public Object updateAvatar(@PathVariable Object organization) { return null; // TODO implement updateAvatar request controller } @Secured("ROLE_USER") - @RequestMapping("/organisations/{organisations}/settings/members") - public Object updateMembers(@PathVariable Object organisations) { + @RequestMapping("/organizations/{organization}/settings/members") + public Object updateMembers(@PathVariable Object organization) { return null; // TODO implement updateMembers request controller } @Secured("ROLE_USER") - @RequestMapping("/organisations/{organisations}/settings/members/remove") - public Object removeMember(@PathVariable Object organisations) { + @RequestMapping("/organizations/{organization}/settings/members/remove") + public Object removeMember(@PathVariable Object organization) { return null; // TODO implement removeMember request controller } diff --git a/src/main/java/io/papermc/hangar/util/RouteHelper.java b/src/main/java/io/papermc/hangar/util/RouteHelper.java index 66b42960e..75f2e4657 100644 --- a/src/main/java/io/papermc/hangar/util/RouteHelper.java +++ b/src/main/java/io/papermc/hangar/util/RouteHelper.java @@ -108,12 +108,12 @@ public class RouteHelper { register("users.userSitemap", "/{user}/sitemap.xml", of("user"), of()); register("users.editApiKeys", "/{user}/settings/apiKeys", of("user"), of()); - register("org.updateMembers", "/organisations/{organisations}/settings/members", of("organisations"), of()); - register("org.updateAvatar", "/organisations/{organisations}/settings/avatar", of("organisations"), of()); - register("org.setInviteStatus", "/organisations/invite/{id}/{status}", of("id", "status"), of()); - register("org.showCreator", "/organisations/new", of(), of()); - register("org.create", "/organisations/new", of(), of()); - register("org.removeMember", "/organisations/{organisations}/settings/members/remove", of("organisations"), of()); + register("org.updateMembers", "/organizations/{organization}/settings/members", of("organization"), of()); + register("org.updateAvatar", "/organizations/{organization}/settings/avatar", of("organization"), of()); + register("org.setInviteStatus", "/organizations/invite/{id}/{status}", of("id", "status"), of()); + register("org.showCreator", "/organizations/new", of(), of()); + register("org.create", "/organizations/new", of(), of()); + register("org.removeMember", "/organizations/{organization}/settings/members/remove", of("organization"), of()); register("reviews.addMessage", "/{author}/{slug}/versions/{version}/reviews/addmessage", of("author", "slug", "version"), of()); register("reviews.backlogToggle", "/{author}/{slug}/versions/{version}/reviews/reviewtoggle", of("author", "slug", "version"), of()); diff --git a/src/test/java/io/papermc/hangar/util/RouteHelperTest.java b/src/test/java/io/papermc/hangar/util/RouteHelperTest.java index 9a58c7f30..fd6c42e9a 100644 --- a/src/test/java/io/papermc/hangar/util/RouteHelperTest.java +++ b/src/test/java/io/papermc/hangar/util/RouteHelperTest.java @@ -18,7 +18,7 @@ class RouteHelperTest { @Test void testSomeShit() throws Exception { assertEquals("/", classUnderTest.getRouteUrl("showHome")); - assertEquals("/organisations/new", classUnderTest.getRouteUrl("org.showCreator")); + assertEquals("/organizations/new", classUnderTest.getRouteUrl("org.showCreator")); assertEquals("/linkout", classUnderTest.getRouteUrl("linkOut", "")); assertEquals("/linkout?remoteUrl=TestUrl", classUnderTest.getRouteUrl("linkOut", "TestUrl")); assertEquals("/staff", classUnderTest.getRouteUrl("users.showStaff", "", ""));