Merge pull request #2897 from MediaBrowser/beta

Beta

1 files changed, 12 insertions, 2 deletions

diff --git a/MediaBrowser.WebDashboard/Api/ConfigurationPageInfo.cs b/MediaBrowser.WebDashboard/Api/ConfigurationPageInfo.cs
index 33289e76c..b69c14fee 100644
--- a/MediaBrowser.WebDashboard/Api/ConfigurationPageInfo.cs
+++ b/MediaBrowser.WebDashboard/Api/ConfigurationPageInfo.cs
@@ -11,6 +11,9 @@ namespace MediaBrowser.WebDashboard.Api
         /// </summary>
         /// <value>The name.</value>
         public string Name { get; set; }
+        public bool EnableInMainMenu { get; set; }
+
+        public string DisplayName { get; set; }
 
         /// <summary>
         /// Gets the type of the configuration page.
@@ -27,15 +30,22 @@ namespace MediaBrowser.WebDashboard.Api
         public ConfigurationPageInfo(IPluginConfigurationPage page)
         {
             Name = page.Name;
+
             ConfigurationPageType = page.ConfigurationPageType;
 
-            // Don't use "N" because it needs to match Plugin.Id
-            PluginId = page.Plugin.Id.ToString();
+            if (page.Plugin != null)
+            {
+                DisplayName = page.Plugin.Name;
+                // Don't use "N" because it needs to match Plugin.Id
+                PluginId = page.Plugin.Id.ToString();
+            }
         }
 
         public ConfigurationPageInfo(IPlugin plugin, PluginPageInfo page)
         {
             Name = page.Name;
+            EnableInMainMenu = page.EnableInMainMenu;
+            DisplayName = string.IsNullOrWhiteSpace(page.DisplayName) ? plugin.Name : page.DisplayName;
 
             // Don't use "N" because it needs to match Plugin.Id
             PluginId = plugin.Id.ToString();