From 4509c804965786df57eeabe6305dd6c6f17c4c30 Mon Sep 17 00:00:00 2001
From: Adam Pardyl <adam@pardyl.com>
Date: Fri, 11 Jan 2019 14:15:58 +0100
Subject: [PATCH] Rename overlapping model and query string variable

---
 .../edu/uj/ii/ksi/mordor/controllers/admin/UsersController.kt | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/main/kotlin/pl/edu/uj/ii/ksi/mordor/controllers/admin/UsersController.kt b/src/main/kotlin/pl/edu/uj/ii/ksi/mordor/controllers/admin/UsersController.kt
index cc58323..610b245 100644
--- a/src/main/kotlin/pl/edu/uj/ii/ksi/mordor/controllers/admin/UsersController.kt
+++ b/src/main/kotlin/pl/edu/uj/ii/ksi/mordor/controllers/admin/UsersController.kt
@@ -62,9 +62,9 @@ class UsersController(private val userRepository: UserRepository, private val us
     }
 
     @Secured(Permission.MANAGE_USERS_STR)
-    @PostMapping("/admin/user/{id}/")
+    @PostMapping("/admin/user/{userId}/")
     fun userProfileEdit(
-        @PathVariable("id") userId: Long,
+        @PathVariable("userId") userId: Long,
         @Valid @ModelAttribute("user") form: UserForm,
         result: BindingResult
     ): ModelAndView {