diff --git a/FModel/ViewModels/ApiEndpoints/FModelApiEndpoint.cs b/FModel/ViewModels/ApiEndpoints/FModelApiEndpoint.cs index 494f08e0..b87911e0 100644 --- a/FModel/ViewModels/ApiEndpoints/FModelApiEndpoint.cs +++ b/FModel/ViewModels/ApiEndpoints/FModelApiEndpoint.cs @@ -153,6 +153,7 @@ public class FModelApiEndpoint : AbstractApiProvider if (args is { CurrentVersion: { } }) { UserSettings.Default.LastUpdateCheck = DateTime.Now; + var qa = (CustomMandatory) args.Mandatory; var currentVersion = new System.Version(args.CurrentVersion); if ((qa.Value && qa.CommitHash == UserSettings.Default.CommitHash) || // qa branch : same commit id diff --git a/FModel/ViewModels/ApiEndpoints/Models/GitHubResponse.cs b/FModel/ViewModels/ApiEndpoints/Models/GitHubResponse.cs index ddffba50..85c15e17 100644 --- a/FModel/ViewModels/ApiEndpoints/Models/GitHubResponse.cs +++ b/FModel/ViewModels/ApiEndpoints/Models/GitHubResponse.cs @@ -24,6 +24,7 @@ public class GitHubAsset : ViewModel [J("download_count")] public int DownloadCount { get; private set; } [J("browser_download_url")] public string BrowserDownloadUrl { get; private set; } [J("created_at")] public DateTime CreatedAt { get; private set; } + [J("uploader")] public Author Uploader { get; private set; } private bool _isLatest; public bool IsLatest @@ -48,8 +49,8 @@ public class GitHubCommit : ViewModel } } - [J("commit")] public Commit Commit { get; private set; } - [J("author")] public Author Author { get; private set; } + [J("commit")] public Commit Commit { get; set; } + [J("author")] public Author Author { get; set; } private GitHubAsset _asset; public GitHubAsset Asset @@ -107,6 +108,7 @@ public class Commit public class Author { [J("name")] public string Name { get; set; } + [J("login")] public string Login { get; set; } [J("date")] public DateTime Date { get; set; } [J("avatar_url")] public string AvatarUrl { get; set; } [J("html_url")] public string HtmlUrl { get; set; } diff --git a/FModel/ViewModels/UpdateViewModel.cs b/FModel/ViewModels/UpdateViewModel.cs index 429678e9..96d0a49f 100644 --- a/FModel/ViewModels/UpdateViewModel.cs +++ b/FModel/ViewModels/UpdateViewModel.cs @@ -45,6 +45,20 @@ public class UpdateViewModel : ViewModel { commit.Asset = asset; } + else + { + Commits.Add(new GitHubCommit + { + Sha = commitSha, + Commit = new Commit + { + Message = "No commit message", + Author = new Author { Name = asset.Uploader.Login, Date = asset.CreatedAt } + }, + Author = asset.Uploader, + Asset = asset + }); + } } } diff --git a/FModel/Views/UpdateView.xaml b/FModel/Views/UpdateView.xaml index 6a1f5165..6d378592 100644 --- a/FModel/Views/UpdateView.xaml +++ b/FModel/Views/UpdateView.xaml @@ -42,16 +42,16 @@ - - - + + + + + + + + + +