|
|
@ -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,9 +130,8 @@ 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()) { |
|
|
@ -136,7 +139,6 @@ public class UserSettingsController { |
|
|
|
} else { |
|
|
|
} else { |
|
|
|
updateUser(command); |
|
|
|
updateUser(command); |
|
|
|
} |
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
resetCommand(command); |
|
|
|
resetCommand(command); |
|
|
|
|
|
|
|
|
|
|
|
return "userSettings"; |
|
|
|
return "userSettings"; |
|
|
|