Archives/Athou_commafeed
1
0
Fork 1
mirror of https://github.com/Athou/commafeed.git synced 2026-03-21 21:37:29 +00:00
Code Issues Packages Projects Releases Wiki Activity

don't use ngupload for opml import, use a classic http post

Browse Source
This commit is contained in:
Athou
2013-05-29 15:13:12 +02:00
parent 5a6a7c9827
commit 7c2d000c26
6 changed files with 6 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/main/java/com/commafeed/frontend/rest/resources/FeedREST.java
View File

@@ -335,7 +335,6 @@ public class FeedREST extends AbstractResourceREST {
@POST
@Path("/import")
@Consumes(MediaType.MULTIPART_FORM_DATA)
@Produces(MediaType.APPLICATION_JSON)
@ApiOperation(value = "OPML import", notes = "Import an OPML file, posted as a FORM with the 'file' name")
public Response importOpml() {
if (StartupBean.USERNAME_DEMO.equals(getUser().getName())) {
@@ -360,7 +359,9 @@ public class FeedREST extends AbstractResourceREST {
.status(Status.INTERNAL_SERVER_ERROR)
.entity(e.getMessage()).build());
}
return Response.ok(Status.OK).build();
return Response.temporaryRedirect(
URI.create(applicationSettingsService.get().getPublicUrl()))
.build();
}
@GET