diff options
| author | Luke Pulverenti <luke.pulverenti@gmail.com> | 2015-09-05 13:19:13 -0400 |
|---|---|---|
| committer | Luke Pulverenti <luke.pulverenti@gmail.com> | 2015-09-05 13:19:13 -0400 |
| commit | 16e4d4599af157f94883412d050b792b97c116f6 (patch) | |
| tree | 81d25e40a0c9cf813ace2aabca9d77c9cb2e4f62 | |
| parent | 890510346a01364404259a5d08f6ee0b6d7dff68 (diff) | |
fix directory browser in startup wizard
| -rw-r--r-- | MediaBrowser.Api/System/SystemService.cs | 3 | ||||
| -rw-r--r-- | MediaBrowser.Model/System/PublicSystemInfo.cs | 6 | ||||
| -rw-r--r-- | MediaBrowser.Model/System/SystemInfo.cs | 11 |
3 files changed, 11 insertions, 9 deletions
diff --git a/MediaBrowser.Api/System/SystemService.cs b/MediaBrowser.Api/System/SystemService.cs index 0a49cf47c..aa1226901 100644 --- a/MediaBrowser.Api/System/SystemService.cs +++ b/MediaBrowser.Api/System/SystemService.cs @@ -178,7 +178,8 @@ namespace MediaBrowser.Api.System ServerName = result.ServerName, Version = result.Version, LocalAddress = result.LocalAddress, - WanAddress = result.WanAddress + WanAddress = result.WanAddress, + OperatingSystem = result.OperatingSystem }; return ToOptimizedResult(publicInfo); diff --git a/MediaBrowser.Model/System/PublicSystemInfo.cs b/MediaBrowser.Model/System/PublicSystemInfo.cs index 3afe72e81..b9a3260b0 100644 --- a/MediaBrowser.Model/System/PublicSystemInfo.cs +++ b/MediaBrowser.Model/System/PublicSystemInfo.cs @@ -27,6 +27,12 @@ namespace MediaBrowser.Model.System public string Version { get; set; } /// <summary> + /// Gets or sets the operating sytem. + /// </summary> + /// <value>The operating sytem.</value> + public string OperatingSystem { get; set; } + + /// <summary> /// Gets or sets the id. /// </summary> /// <value>The id.</value> diff --git a/MediaBrowser.Model/System/SystemInfo.cs b/MediaBrowser.Model/System/SystemInfo.cs index 094c4fda6..c8209baa8 100644 --- a/MediaBrowser.Model/System/SystemInfo.cs +++ b/MediaBrowser.Model/System/SystemInfo.cs @@ -9,11 +9,6 @@ namespace MediaBrowser.Model.System public class SystemInfo : PublicSystemInfo { /// <summary> - /// Gets or sets the operating sytem. - /// </summary> - /// <value>The operating sytem.</value> - public string OperatingSystem { get; set; } - /// <summary> /// Gets or sets the display name of the operating system. /// </summary> /// <value>The display name of the operating system.</value> @@ -30,7 +25,7 @@ namespace MediaBrowser.Model.System /// </summary> /// <value><c>true</c> if [supports running as service]; otherwise, <c>false</c>.</value> public bool SupportsRunningAsService { get; set; } - + /// <summary> /// Gets or sets the mac address. /// </summary> @@ -108,7 +103,7 @@ namespace MediaBrowser.Model.System /// </summary> /// <value>The cache path.</value> public string CachePath { get; set; } - + /// <summary> /// Gets or sets the log path. /// </summary> @@ -120,7 +115,7 @@ namespace MediaBrowser.Model.System /// </summary> /// <value>The internal metadata path.</value> public string InternalMetadataPath { get; set; } - + /// <summary> /// Gets or sets the transcoding temporary path. /// </summary> |