From 212e696f7e76c37b8134acf87f7354baabcb63d4 Mon Sep 17 00:00:00 2001 From: Luke Pulverenti Date: Tue, 21 May 2013 16:36:26 -0400 Subject: [PATCH] added library settings page --- .../Providers/Music/LastfmArtistProvider.cs | 7 +------ MediaBrowser.WebDashboard/Api/DashboardService.cs | 1 + MediaBrowser.WebDashboard/MediaBrowser.WebDashboard.csproj | 6 ++++++ 3 files changed, 8 insertions(+), 6 deletions(-) diff --git a/MediaBrowser.Controller/Providers/Music/LastfmArtistProvider.cs b/MediaBrowser.Controller/Providers/Music/LastfmArtistProvider.cs index 8461b84bbf..4837b4da9b 100644 --- a/MediaBrowser.Controller/Providers/Music/LastfmArtistProvider.cs +++ b/MediaBrowser.Controller/Providers/Music/LastfmArtistProvider.cs @@ -120,12 +120,7 @@ namespace MediaBrowser.Controller.Providers.Music var artist = searchResult.results.artistmatches.artist .FirstOrDefault(i => i.name != null && string.Compare(i.name, item.Name, CultureInfo.CurrentCulture, CompareOptions.IgnoreNonSpace | CompareOptions.IgnoreCase | CompareOptions.IgnoreSymbols) == 0); - if (artist == null) - { - return null; - } - - return artist.mbid; + return artist == null ? null : artist.mbid; } } } diff --git a/MediaBrowser.WebDashboard/Api/DashboardService.cs b/MediaBrowser.WebDashboard/Api/DashboardService.cs index d4a4fb7083..c64b86d7ce 100644 --- a/MediaBrowser.WebDashboard/Api/DashboardService.cs +++ b/MediaBrowser.WebDashboard/Api/DashboardService.cs @@ -475,6 +475,7 @@ namespace MediaBrowser.WebDashboard.Api "itembynamedetailpage.js", "itemdetailpage.js", "itemlistpage.js", + "librarysettings.js", "loginpage.js", "logpage.js", "medialibrarypage.js", diff --git a/MediaBrowser.WebDashboard/MediaBrowser.WebDashboard.csproj b/MediaBrowser.WebDashboard/MediaBrowser.WebDashboard.csproj index 219c31b435..f02e589f29 100644 --- a/MediaBrowser.WebDashboard/MediaBrowser.WebDashboard.csproj +++ b/MediaBrowser.WebDashboard/MediaBrowser.WebDashboard.csproj @@ -270,6 +270,9 @@ + + PreserveNewest + PreserveNewest @@ -306,6 +309,9 @@ PreserveNewest + + PreserveNewest + PreserveNewest