Browse Source

added library settings page

Luke Pulverenti 12 years ago
parent
commit
212e696f7e

+ 1 - 6
MediaBrowser.Controller/Providers/Music/LastfmArtistProvider.cs

@@ -120,12 +120,7 @@ namespace MediaBrowser.Controller.Providers.Music
                         var artist = searchResult.results.artistmatches.artist
                         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);
                             .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;
                     }
                     }
                 }
                 }
             }
             }

+ 1 - 0
MediaBrowser.WebDashboard/Api/DashboardService.cs

@@ -475,6 +475,7 @@ namespace MediaBrowser.WebDashboard.Api
                                       "itembynamedetailpage.js",
                                       "itembynamedetailpage.js",
                                       "itemdetailpage.js",
                                       "itemdetailpage.js",
                                       "itemlistpage.js",
                                       "itemlistpage.js",
+                                      "librarysettings.js",
                                       "loginpage.js",
                                       "loginpage.js",
                                       "logpage.js",
                                       "logpage.js",
                                       "medialibrarypage.js",
                                       "medialibrarypage.js",

+ 6 - 0
MediaBrowser.WebDashboard/MediaBrowser.WebDashboard.csproj

@@ -270,6 +270,9 @@
     </Content>
     </Content>
   </ItemGroup>
   </ItemGroup>
   <ItemGroup>
   <ItemGroup>
+    <Content Include="dashboard-ui\librarysettings.html">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </Content>
     <Content Include="dashboard-ui\moviegenres.html">
     <Content Include="dashboard-ui\moviegenres.html">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
     </Content>
@@ -306,6 +309,9 @@
     <Content Include="dashboard-ui\scripts\edititemmetadata.js">
     <Content Include="dashboard-ui\scripts\edititemmetadata.js">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
     </Content>
+    <Content Include="dashboard-ui\scripts\librarysettings.js">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </Content>
     <Content Include="dashboard-ui\scripts\musicrecommended.js">
     <Content Include="dashboard-ui\scripts\musicrecommended.js">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
     </Content>