From d78244aa36ef596ce8a16ce3189802651c16c81a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?R=C3=A9mi=20Cocula?= <rcocula@gmail.com>
Date: Sun, 11 Dec 2016 19:31:33 +0100
Subject: [PATCH] Corrections on UserSettingsController.

---
 .../controller/UserSettingsController.java    | 26 ++++++++++---------
 1 file changed, 14 insertions(+), 12 deletions(-)

diff --git a/libresonic-main/src/main/java/org/libresonic/player/controller/UserSettingsController.java b/libresonic-main/src/main/java/org/libresonic/player/controller/UserSettingsController.java
index adc91939..256acf77 100644
--- a/libresonic-main/src/main/java/org/libresonic/player/controller/UserSettingsController.java
+++ b/libresonic-main/src/main/java/org/libresonic/player/controller/UserSettingsController.java
@@ -73,7 +73,12 @@ public class UserSettingsController {
     }
 
     @RequestMapping(method = RequestMethod.GET)
-    protected String formBackingObject(HttpServletRequest request,Model model) throws Exception {
+    protected String displayForm() throws Exception {
+        return "userSettings";
+    }
+
+    @ModelAttribute
+    protected void formBackingObject(HttpServletRequest request,Model model) throws Exception {
         UserSettingsCommand command = new UserSettingsCommand();
 
         User user = getUser(request);
@@ -99,7 +104,6 @@ public class UserSettingsController {
         command.setAllowedMusicFolderIds(Util.toIntArray(getAllowedMusicFolderIds(user)));
 
         model.addAttribute("command",command);
-        return "userSettings";
     }
 
     private User getUser(HttpServletRequest request) throws ServletRequestBindingException {
@@ -126,16 +130,14 @@ public class UserSettingsController {
     }
 
     @RequestMapping(method = RequestMethod.POST)
-    protected String doSubmitAction(@ModelAttribute("command") @Validated UserSettingsCommand command,final BindingResult binding) throws Exception {
-
-        if (!binding.hasErrors()) {
-            if (command.isDeleteUser()) {
-                deleteUser(command);
-            } else if (command.isNewUser()) {
-                createUser(command);
-            } else {
-                updateUser(command);
-            }
+    protected String doSubmitAction(@ModelAttribute("command") @Validated UserSettingsCommand command) throws Exception {
+
+        if (command.isDeleteUser()) {
+            deleteUser(command);
+        } else if (command.isNewUser()) {
+            createUser(command);
+        } else {
+            updateUser(command);
         }
         resetCommand(command);