aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--MediaBrowser.WebDashboard/Api/ConfigurationPageInfo.cs33
-rw-r--r--MediaBrowser.WebDashboard/Api/DashboardService.cs6
-rw-r--r--MediaBrowser.WebDashboard/Html/scripts/PluginsPage.js2
-rw-r--r--MediaBrowser.WebDashboard/MediaBrowser.WebDashboard.csproj1
4 files changed, 38 insertions, 4 deletions
diff --git a/MediaBrowser.WebDashboard/Api/ConfigurationPageInfo.cs b/MediaBrowser.WebDashboard/Api/ConfigurationPageInfo.cs
new file mode 100644
index 000000000..69383f7ed
--- /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
+ {
+ /// <summary>
+ /// Gets the name.
+ /// </summary>
+ /// <value>The name.</value>
+ public string Name { get; set; }
+
+ /// <summary>
+ /// Gets the type of the configuration page.
+ /// </summary>
+ /// <value>The type of the configuration page.</value>
+ public ConfigurationPageType ConfigurationPageType { get; set; }
+
+ /// <summary>
+ /// Gets or sets the plugin id.
+ /// </summary>
+ /// <value>The plugin id.</value>
+ 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 7428b4389..d9852446e 100644
--- a/MediaBrowser.WebDashboard/Api/DashboardService.cs
+++ b/MediaBrowser.WebDashboard/Api/DashboardService.cs
@@ -25,7 +25,7 @@ namespace MediaBrowser.WebDashboard.Api
/// Class GetDashboardConfigurationPages
/// </summary>
[Route("/dashboard/ConfigurationPages", "GET")]
- public class GetDashboardConfigurationPages : IReturn<List<IPluginConfigurationPage>>
+ public class GetDashboardConfigurationPages : IReturn<List<ConfigurationPageInfo>>
{
/// <summary>
/// Gets or sets the type of the page.
@@ -38,7 +38,7 @@ namespace MediaBrowser.WebDashboard.Api
/// Class GetDashboardConfigurationPage
/// </summary>
[Route("/dashboard/ConfigurationPage", "GET")]
- public class GetDashboardConfigurationPage : IReturn<IPluginConfigurationPage>
+ public class GetDashboardConfigurationPage
{
/// <summary>
/// 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());
}
/// <summary>
diff --git a/MediaBrowser.WebDashboard/Html/scripts/PluginsPage.js b/MediaBrowser.WebDashboard/Html/scripts/PluginsPage.js
index 5cb894dd5..c8ffe02d8 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 += "<li>";
diff --git a/MediaBrowser.WebDashboard/MediaBrowser.WebDashboard.csproj b/MediaBrowser.WebDashboard/MediaBrowser.WebDashboard.csproj
index d4299ac3a..ca223f63b 100644
--- a/MediaBrowser.WebDashboard/MediaBrowser.WebDashboard.csproj
+++ b/MediaBrowser.WebDashboard/MediaBrowser.WebDashboard.csproj
@@ -81,6 +81,7 @@
<Compile Include="..\SharedVersion.cs">
<Link>Properties\SharedVersion.cs</Link>
</Compile>
+ <Compile Include="Api\ConfigurationPageInfo.cs" />
<Compile Include="Api\DashboardInfo.cs" />
<Compile Include="Api\DashboardService.cs" />
<Compile Include="Api\DashboardInfoWebSocketListener.cs" />