diff --git a/MediaBrowser.WebDashboard/Api/ConfigurationPageInfo.cs b/MediaBrowser.WebDashboard/Api/ConfigurationPageInfo.cs new file mode 100644 index 0000000000..69383f7ed4 --- /dev/null +++ b/MediaBrowser.WebDashboard/Api/ConfigurationPageInfo.cs @@ -0,0 +1,33 @@ +using System; +using MediaBrowser.Controller.Plugins; + +namespace MediaBrowser.WebDashboard.Api +{ + public class ConfigurationPageInfo + { + /// + /// Gets the name. + /// + /// The name. + public string Name { get; set; } + + /// + /// Gets the type of the configuration page. + /// + /// The type of the configuration page. + public ConfigurationPageType ConfigurationPageType { get; set; } + + /// + /// Gets or sets the plugin id. + /// + /// The plugin id. + public Guid PluginId { get; set; } + + public ConfigurationPageInfo(IPluginConfigurationPage page) + { + Name = page.Name; + ConfigurationPageType = page.ConfigurationPageType; + PluginId = page.Plugin.Id; + } + } +} diff --git a/MediaBrowser.WebDashboard/Api/DashboardService.cs b/MediaBrowser.WebDashboard/Api/DashboardService.cs index 7428b43897..d9852446ef 100644 --- a/MediaBrowser.WebDashboard/Api/DashboardService.cs +++ b/MediaBrowser.WebDashboard/Api/DashboardService.cs @@ -25,7 +25,7 @@ namespace MediaBrowser.WebDashboard.Api /// Class GetDashboardConfigurationPages /// [Route("/dashboard/ConfigurationPages", "GET")] - public class GetDashboardConfigurationPages : IReturn> + public class GetDashboardConfigurationPages : IReturn> { /// /// Gets or sets the type of the page. @@ -38,7 +38,7 @@ namespace MediaBrowser.WebDashboard.Api /// Class GetDashboardConfigurationPage /// [Route("/dashboard/ConfigurationPage", "GET")] - public class GetDashboardConfigurationPage : IReturn + public class GetDashboardConfigurationPage { /// /// Gets or sets the name. @@ -174,7 +174,7 @@ namespace MediaBrowser.WebDashboard.Api pages = pages.Where(p => p.ConfigurationPageType == request.PageType.Value); } - return ToOptimizedResult(pages.ToList()); + return ToOptimizedResult(pages.Select(p => new ConfigurationPageInfo(p)).ToList()); } /// diff --git a/MediaBrowser.WebDashboard/Html/scripts/PluginsPage.js b/MediaBrowser.WebDashboard/Html/scripts/PluginsPage.js index 5cb894dd50..c8ffe02d8f 100644 --- a/MediaBrowser.WebDashboard/Html/scripts/PluginsPage.js +++ b/MediaBrowser.WebDashboard/Html/scripts/PluginsPage.js @@ -36,7 +36,7 @@ var plugin = plugins[i]; var configPage = $.grep(pluginConfigurationPages, function (pluginConfigurationPage) { - return pluginConfigurationPage.Plugin.Id == plugin.Id; + return pluginConfigurationPage.PluginId == plugin.Id; })[0]; html += "
  • "; diff --git a/MediaBrowser.WebDashboard/MediaBrowser.WebDashboard.csproj b/MediaBrowser.WebDashboard/MediaBrowser.WebDashboard.csproj index d4299ac3a6..ca223f63bc 100644 --- a/MediaBrowser.WebDashboard/MediaBrowser.WebDashboard.csproj +++ b/MediaBrowser.WebDashboard/MediaBrowser.WebDashboard.csproj @@ -81,6 +81,7 @@ Properties\SharedVersion.cs +