From 4752ba3341967ddcdbff0aeaf58cb46dc04ce124 Mon Sep 17 00:00:00 2001 From: Mark McDowall Date: Thu, 20 Mar 2014 22:20:35 -0700 Subject: [PATCH] Fixed: Downloading log file asking for password when authentication is disabled --- src/NzbDrone.Api/Frontend/Mappers/LogFileMapper.cs | 2 +- src/NzbDrone.Api/Logs/LogFileModule.cs | 2 +- src/UI/System/Logs/Files/ContentsModel.js | 2 +- src/UI/System/Logs/Files/DownloadLogCell.js | 2 +- src/UI/System/Logs/Files/LogFileCollection.js | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/NzbDrone.Api/Frontend/Mappers/LogFileMapper.cs b/src/NzbDrone.Api/Frontend/Mappers/LogFileMapper.cs index 9d293ee65..bc7124a97 100644 --- a/src/NzbDrone.Api/Frontend/Mappers/LogFileMapper.cs +++ b/src/NzbDrone.Api/Frontend/Mappers/LogFileMapper.cs @@ -26,7 +26,7 @@ namespace NzbDrone.Api.Frontend.Mappers public override bool CanHandle(string resourceUrl) { - return resourceUrl.StartsWith("/log/") && resourceUrl.EndsWith(".txt"); + return resourceUrl.StartsWith("/logfile/") && resourceUrl.EndsWith(".txt"); } } } \ No newline at end of file diff --git a/src/NzbDrone.Api/Logs/LogFileModule.cs b/src/NzbDrone.Api/Logs/LogFileModule.cs index 5e63bb036..94153428a 100644 --- a/src/NzbDrone.Api/Logs/LogFileModule.cs +++ b/src/NzbDrone.Api/Logs/LogFileModule.cs @@ -14,7 +14,7 @@ namespace NzbDrone.Api.Logs public LogFileModule(IAppFolderInfo appFolderInfo, IDiskProvider diskProvider) - : base("log/files") + : base("log/file") { _appFolderInfo = appFolderInfo; _diskProvider = diskProvider; diff --git a/src/UI/System/Logs/Files/ContentsModel.js b/src/UI/System/Logs/Files/ContentsModel.js index 10c20152a..b8d2bdc73 100644 --- a/src/UI/System/Logs/Files/ContentsModel.js +++ b/src/UI/System/Logs/Files/ContentsModel.js @@ -6,7 +6,7 @@ define( ], function (Backbone, StatusModel) { return Backbone.Model.extend({ url: function () { - return StatusModel.get('urlBase') + '/log/' + this.get('filename'); + return StatusModel.get('urlBase') + '/logfile/' + this.get('filename'); }, parse: function (contents) { diff --git a/src/UI/System/Logs/Files/DownloadLogCell.js b/src/UI/System/Logs/Files/DownloadLogCell.js index 371336d81..6ce544374 100644 --- a/src/UI/System/Logs/Files/DownloadLogCell.js +++ b/src/UI/System/Logs/Files/DownloadLogCell.js @@ -10,7 +10,7 @@ define( render: function () { this.$el.empty(); - this.$el.html('Download'.format(StatusModel.get('urlBase'), this.cellValue)); + this.$el.html('Download'.format(StatusModel.get('urlBase'), this.cellValue)); return this; } diff --git a/src/UI/System/Logs/Files/LogFileCollection.js b/src/UI/System/Logs/Files/LogFileCollection.js index 88fefca42..3930025b2 100644 --- a/src/UI/System/Logs/Files/LogFileCollection.js +++ b/src/UI/System/Logs/Files/LogFileCollection.js @@ -6,7 +6,7 @@ define( 'System/Logs/Files/LogFileModel' ], function (Backbone, LogFileModel) { return Backbone.Collection.extend({ - url : window.NzbDrone.ApiRoot + '/log/files', + url : window.NzbDrone.ApiRoot + '/log/file', model: LogFileModel, state: {