MightyPork/airsonic-custom
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Corrections on UserSettingsController.

Browse Source
This commit is contained in:
Rémi Cocula
2016-12-11 19:31:33 +01:00
parent ddea3f47ff
commit d78244aa36
1 changed files with 13 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
libresonic-main/src/main/java/org/libresonic/player/controller/UserSettingsController.java
+13 -11
View File
@@ -73,7 +73,12 @@ public class UserSettingsController {
} }
@RequestMapping(method = RequestMethod.GET) @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(); UserSettingsCommand command = new UserSettingsCommand();
User user = getUser(request); User user = getUser(request);
@@ -99,7 +104,6 @@ public class UserSettingsController {
command.setAllowedMusicFolderIds(Util.toIntArray(getAllowedMusicFolderIds(user))); command.setAllowedMusicFolderIds(Util.toIntArray(getAllowedMusicFolderIds(user)));
model.addAttribute("command",command); model.addAttribute("command",command);
return "userSettings";
} }
private User getUser(HttpServletRequest request) throws ServletRequestBindingException { private User getUser(HttpServletRequest request) throws ServletRequestBindingException {
@@ -126,16 +130,14 @@ public class UserSettingsController {
} }
@RequestMapping(method = RequestMethod.POST) @RequestMapping(method = RequestMethod.POST)
protected String doSubmitAction(@ModelAttribute("command") @Validated UserSettingsCommand command,final BindingResult binding) throws Exception { protected String doSubmitAction(@ModelAttribute("command") @Validated UserSettingsCommand command) throws Exception {
if (!binding.hasErrors()) { if (command.isDeleteUser()) {
if (command.isDeleteUser()) { deleteUser(command);
deleteUser(command); } else if (command.isNewUser()) {
} else if (command.isNewUser()) { createUser(command);
createUser(command); } else {
} else { updateUser(command);
updateUser(command);
}
} }
resetCommand(command); resetCommand(command);