From e123884a146cf5d5a64cacd1350f99cea44a044b Mon Sep 17 00:00:00 2001 From: unknown Date: Sun, 26 Jul 2015 15:45:35 -0600 Subject: [PATCH] Route fixes --- src/Jackett/Content/custom.js | 2 +- src/Jackett/Controllers/APIController.cs | 9 +-------- src/Jackett/Controllers/AdminController.cs | 11 ++++++++++- 3 files changed, 12 insertions(+), 10 deletions(-) diff --git a/src/Jackett/Content/custom.js b/src/Jackett/Content/custom.js index ee5e31bfe..9cb3c4349 100644 --- a/src/Jackett/Content/custom.js +++ b/src/Jackett/Content/custom.js @@ -21,7 +21,7 @@ function loadJackettSettings() { } $("#jackett-show-releases").click(function () { - var jqxhr = $.get("/api/GetCache", function (data) { + var jqxhr = $.get("/admin/GetCache", function (data) { var releaseTemplate = Handlebars.compile($("#jackett-releases").html()); var item = { releases: data, Title: 'Releases' }; var releaseDialog = $(releaseTemplate(item)); diff --git a/src/Jackett/Controllers/APIController.cs b/src/Jackett/Controllers/APIController.cs index edd00d05a..1ba8fac6d 100644 --- a/src/Jackett/Controllers/APIController.cs +++ b/src/Jackett/Controllers/APIController.cs @@ -14,7 +14,6 @@ using System.Web.Http; namespace Jackett.Controllers { - [RoutePrefix("API")] [AllowAnonymous] public class APIController : ApiController { @@ -31,7 +30,6 @@ namespace Jackett.Controllers cacheService = c; } - [Route("Call")] [HttpGet] public async Task Call(string indexerID) { @@ -114,11 +112,6 @@ namespace Jackett.Controllers }; } - [Route("GetCache")] - [HttpGet] - public List GetCache() - { - return cacheService.GetCachedResults(); - } + } } diff --git a/src/Jackett/Controllers/AdminController.cs b/src/Jackett/Controllers/AdminController.cs index 8cc4b5828..4900f951a 100644 --- a/src/Jackett/Controllers/AdminController.cs +++ b/src/Jackett/Controllers/AdminController.cs @@ -31,14 +31,16 @@ namespace Jackett.Controllers private IServerService serverService; private ISecuityService securityService; private IProcessService processService; + private ICacheService cacheService; - public AdminController(IConfigurationService config, IIndexerManagerService i, IServerService ss, ISecuityService s, IProcessService p) + public AdminController(IConfigurationService config, IIndexerManagerService i, IServerService ss, ISecuityService s, IProcessService p, ICacheService c) { this.config = config; indexerService = i; serverService = ss; securityService = s; processService = p; + cacheService = c; } private async Task ReadPostDataJson() @@ -353,6 +355,13 @@ namespace Jackett.Controllers } return Json(jsonReply); } + + [Route("GetCache")] + [HttpGet] + public List GetCache() + { + return cacheService.GetCachedResults(); + } } }