From b2f3afebc7de684d1d49042f5f79a9cbf9c1f2f2 Mon Sep 17 00:00:00 2001 From: Vitaly Takmazov Date: Wed, 14 Mar 2018 10:04:40 +0300 Subject: refactor email settings --- juick-www/src/main/java/com/juick/www/controllers/Settings.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'juick-www/src/main/java/com/juick/www/controllers') diff --git a/juick-www/src/main/java/com/juick/www/controllers/Settings.java b/juick-www/src/main/java/com/juick/www/controllers/Settings.java index a1d58ada..141c9e2c 100644 --- a/juick-www/src/main/java/com/juick/www/controllers/Settings.java +++ b/juick-www/src/main/java/com/juick/www/controllers/Settings.java @@ -94,7 +94,7 @@ public class Settings { model.addAttribute("visitor", visitor); model.addAttribute("tags", tagService.getPopularTags()); model.addAttribute("auths", userService.getAuthCodes(visitor)); - model.addAttribute("eopts", userService.getEmailOpts(visitor)); + model.addAttribute("email_active", emailService.getNotificationsEmail(visitor.getUid())); model.addAttribute("ehash", userService.getEmailHash(visitor)); model.addAttribute("emails", userService.getEmails(visitor)); model.addAttribute("jids", userService.getAllJIDs(visitor)); @@ -121,7 +121,7 @@ public class Settings { protected String doPost(HttpServletRequest request, HttpServletResponse response, @RequestParam(required = false) MultipartFile avatar, ModelMap model) - throws IOException, ServletException { + throws IOException { com.juick.User visitor = UserUtils.getCurrentUser(); if (visitor.getUid() == 0) { throw new HttpBadRequestException(); -- cgit v1.2.3