mirror of
https://github.com/Athou/commafeed.git
synced 2026-03-21 21:37:29 +00:00
save settings on read mode change
This commit is contained in:
@@ -4,6 +4,7 @@ import javax.annotation.PostConstruct;
|
||||
import javax.inject.Inject;
|
||||
import javax.servlet.http.HttpServletRequest;
|
||||
import javax.servlet.http.HttpServletResponse;
|
||||
import javax.ws.rs.Consumes;
|
||||
import javax.ws.rs.Produces;
|
||||
import javax.ws.rs.WebApplicationException;
|
||||
import javax.ws.rs.core.Context;
|
||||
@@ -27,6 +28,7 @@ import com.commafeed.frontend.CommaFeedApplication;
|
||||
import com.commafeed.frontend.CommaFeedSession;
|
||||
|
||||
@Produces(MediaType.APPLICATION_JSON)
|
||||
@Consumes(MediaType.APPLICATION_JSON)
|
||||
public abstract class AbstractREST {
|
||||
|
||||
@Context
|
||||
|
||||
@@ -3,6 +3,8 @@ package com.commafeed.frontend.rest.resources;
|
||||
import javax.ws.rs.GET;
|
||||
import javax.ws.rs.POST;
|
||||
import javax.ws.rs.Path;
|
||||
import javax.ws.rs.core.Response;
|
||||
import javax.ws.rs.core.Response.Status;
|
||||
|
||||
import com.commafeed.backend.model.UserSettings;
|
||||
import com.commafeed.backend.model.UserSettings.ReadingMode;
|
||||
@@ -14,15 +16,19 @@ public class SettingsREST extends AbstractREST {
|
||||
@Path("get")
|
||||
@GET
|
||||
public Settings get() {
|
||||
UserSettings settings = userSettingsService.findByUser(getUser());
|
||||
Settings s = new Settings();
|
||||
s.setReadingMode(settings.getReadingMode().name().toLowerCase());
|
||||
UserSettings settings = userSettingsService.findByUser(getUser());
|
||||
if (settings != null) {
|
||||
s.setReadingMode(settings.getReadingMode().name());
|
||||
} else {
|
||||
s.setReadingMode(ReadingMode.unread.name());
|
||||
}
|
||||
return s;
|
||||
}
|
||||
|
||||
@Path("save")
|
||||
@POST
|
||||
public void save(Settings settings) {
|
||||
public Response save(Settings settings) {
|
||||
UserSettings s = userSettingsService.findByUser(getUser());
|
||||
if (s == null) {
|
||||
s = new UserSettings();
|
||||
@@ -30,6 +36,7 @@ public class SettingsREST extends AbstractREST {
|
||||
}
|
||||
s.setReadingMode(ReadingMode.valueOf(settings.getReadingMode()));
|
||||
userSettingsService.saveOrUpdate(s);
|
||||
return Response.ok(Status.OK).build();
|
||||
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user