diff --git a/src/main/java/com/commafeed/frontend/rest/resources/FeedREST.java b/src/main/java/com/commafeed/frontend/rest/resources/FeedREST.java index 1f3bf385..64d9d1f7 100644 --- a/src/main/java/com/commafeed/frontend/rest/resources/FeedREST.java +++ b/src/main/java/com/commafeed/frontend/rest/resources/FeedREST.java @@ -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 diff --git a/src/main/webapp/WEB-INF/wro.xml b/src/main/webapp/WEB-INF/wro.xml index 0932b14f..2baeecc0 100644 --- a/src/main/webapp/WEB-INF/wro.xml +++ b/src/main/webapp/WEB-INF/wro.xml @@ -12,7 +12,6 @@ /vendor/mousetrap/*.js /vendor/nggrid/*.js /vendor/nginfinitescroll/*.js - /vendor/ngupload/*.js /vendor/spinjs/*.js /vendor/momentjs/*.js diff --git a/src/main/webapp/js/controllers.js b/src/main/webapp/js/controllers.js index 8017810b..16c711cb 100644 --- a/src/main/webapp/js/controllers.js +++ b/src/main/webapp/js/controllers.js @@ -97,11 +97,6 @@ function($scope, FeedService, CategoryService, MobileService) { $scope.isOpenImport = false; }; - $scope.uploadComplete = function(contents, completed) { - CategoryService.init(); - $scope.closeImport(); - }; - $scope.cat = {}; $scope.openCategory = function() { diff --git a/src/main/webapp/js/main.js b/src/main/webapp/js/main.js index cfd8395b..4cb3c26b 100644 --- a/src/main/webapp/js/main.js +++ b/src/main/webapp/js/main.js @@ -1,6 +1,6 @@ var app = angular.module('commafeed', [ 'ui', 'ui.bootstrap', 'ui.state', 'commafeed.directives', 'commafeed.controllers', 'commafeed.services', - 'commafeed.filters', 'ngSanitize', 'ngUpload', 'infinite-scroll', + 'commafeed.filters', 'ngSanitize', 'infinite-scroll', 'ngGrid' ]); app.config([ '$routeProvider', '$stateProvider', '$urlRouterProvider', '$httpProvider', diff --git a/src/main/webapp/templates/_subscribe.html b/src/main/webapp/templates/_subscribe.html index 4238c586..b4674501 100644 --- a/src/main/webapp/templates/_subscribe.html +++ b/src/main/webapp/templates/_subscribe.html @@ -61,7 +61,7 @@

${tree.import}

-
+