From 877a851fe9228447e67dca5ba4593e8a19eb2886 Mon Sep 17 00:00:00 2001 From: Mark McDowall Date: Fri, 31 Oct 2014 08:42:09 -0700 Subject: [PATCH] Fixed: Only show install/cannot install on the latest version --- src/NzbDrone.Api/Update/UpdateModule.cs | 22 ++++++++++--------- src/NzbDrone.Api/Update/UpdateResource.cs | 3 ++- .../System/Update/UpdateItemViewTemplate.hbs | 10 +++++---- 3 files changed, 20 insertions(+), 15 deletions(-) diff --git a/src/NzbDrone.Api/Update/UpdateModule.cs b/src/NzbDrone.Api/Update/UpdateModule.cs index e0041438c..bd4cb5dc4 100644 --- a/src/NzbDrone.Api/Update/UpdateModule.cs +++ b/src/NzbDrone.Api/Update/UpdateModule.cs @@ -22,17 +22,19 @@ namespace NzbDrone.Api.Update .OrderByDescending(u => u.Version) .InjectTo>(); - foreach (var updateResource in resources) - { - if (updateResource.Version > BuildInfo.Version) - { - updateResource.IsUpgrade = true; - } + var first = resources.First(); + first.Latest = true; - else if (updateResource.Version == BuildInfo.Version) - { - updateResource.Installed = true; - } + if (first.Version > BuildInfo.Version) + { + first.Installable = true; + } + + var installed = resources.SingleOrDefault(r => r.Version == BuildInfo.Version); + + if (installed != null) + { + installed.Installed = true; } return resources; diff --git a/src/NzbDrone.Api/Update/UpdateResource.cs b/src/NzbDrone.Api/Update/UpdateResource.cs index c12edfbc1..c180f687e 100644 --- a/src/NzbDrone.Api/Update/UpdateResource.cs +++ b/src/NzbDrone.Api/Update/UpdateResource.cs @@ -14,8 +14,9 @@ namespace NzbDrone.Api.Update public DateTime ReleaseDate { get; set; } public String FileName { get; set; } public String Url { get; set; } - public Boolean IsUpgrade { get; set; } public Boolean Installed { get; set; } + public Boolean Installable { get; set; } + public Boolean Latest { get; set; } public UpdateChanges Changes { get; set; } public String Hash { get; set; } } diff --git a/src/UI/System/Update/UpdateItemViewTemplate.hbs b/src/UI/System/Update/UpdateItemViewTemplate.hbs index 3af52edad..b8c7fddb1 100644 --- a/src/UI/System/Update/UpdateItemViewTemplate.hbs +++ b/src/UI/System/Update/UpdateItemViewTemplate.hbs @@ -8,10 +8,12 @@ {{#if installed}} Installed {{else}} - {{#if isUpgrade}} - Install - {{else}} - Install + {{#if latest}} + {{#if installable}} + Install + {{else}} + Install + {{/if}} {{/if}} {{/if}}