Archive-Team
/
sonarr-repo-only
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

branch is now part of status api and shows up in the footer if not on master.

This commit is contained in:
kay.one 2013-08-10 13:13:31 -07:00
parent 505c154fb6
commit d4706dd8f5
3 changed files with 16 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
NzbDrone.Api/System/SystemModule.cs
View File

@ -3,6 +3,7 @@ using Nancy.Routing;
using NzbDrone.Common; using NzbDrone.Common;
using NzbDrone.Api.Extensions; using NzbDrone.Api.Extensions;
using NzbDrone.Common.EnvironmentInfo; using NzbDrone.Common.EnvironmentInfo;
using NzbDrone.Core.Configuration;
namespace NzbDrone.Api.System namespace NzbDrone.Api.System
{ {
@ -11,13 +12,15 @@ namespace NzbDrone.Api.System
private readonly IAppFolderInfo _appFolderInfo; private readonly IAppFolderInfo _appFolderInfo;
private readonly IRuntimeInfo _runtimeInfo; private readonly IRuntimeInfo _runtimeInfo;
private readonly IRouteCacheProvider _routeCacheProvider; private readonly IRouteCacheProvider _routeCacheProvider;
private readonly IConfigFileProvider _configFileProvider;
public SystemModule(IAppFolderInfo appFolderInfo, IRuntimeInfo runtimeInfo, IRouteCacheProvider routeCacheProvider) public SystemModule(IAppFolderInfo appFolderInfo, IRuntimeInfo runtimeInfo, IRouteCacheProvider routeCacheProvider, IConfigFileProvider configFileProvider)
: base("system") : base("system")
{ {
_appFolderInfo = appFolderInfo; _appFolderInfo = appFolderInfo;
_runtimeInfo = runtimeInfo; _runtimeInfo = runtimeInfo;
_routeCacheProvider = routeCacheProvider; _routeCacheProvider = routeCacheProvider;
_configFileProvider = configFileProvider;
Get["/status"] = x => GetStatus(); Get["/status"] = x => GetStatus();
Get["/routes"] = x => GetRoutes(); Get["/routes"] = x => GetRoutes();
} }
@ -37,6 +40,8 @@ namespace NzbDrone.Api.System
OsVersion = OsInfo.Version.ToString(), OsVersion = OsInfo.Version.ToString(),
IsMono = OsInfo.IsMono, IsMono = OsInfo.IsMono,
IsLinux = OsInfo.IsLinux, IsLinux = OsInfo.IsLinux,
Branch = _configFileProvider.Branch,
Authentication = _configFileProvider.AuthenticationEnabled
}.AsResponse(); }.AsResponse();
} }

2
UI/Series/Index/FooterView.js
View File

@ -1,4 +1,4 @@
'use strict'; 'use strict';
define( define(
[ [
'marionette' 'marionette'

10
UI/ServerStatus.js
View File

@ -8,4 +8,12 @@ var statusText = $.ajax({
window.ServerStatus = JSON.parse(statusText); window.ServerStatus = JSON.parse(statusText);
$('#footer-region .version').html(window.ServerStatus.version); var footerText = window.ServerStatus.version;
$(document).ready(function () {
if (window.ServerStatus.branch != 'master') {
footerText = '</br>' + window.ServerStatus.branch;
}
$('#footer-region .version').html(footerText);
});