diff options
| author | Shlomo Hecht <shlomo@twine-s.com> | 2019-02-10 18:28:41 +0200 |
|---|---|---|
| committer | Shlomo Hecht <shlomo@twine-s.com> | 2019-02-10 18:28:41 +0200 |
| commit | a65868d1d77b1929b855abd0c19bdc08bc9cee9d (patch) | |
| tree | 09486bed718fb096914780f33313fb82a0207c87 /Software/Visual_Studio/Web/Tango.MachineService | |
| parent | 82179e1b69b62b971a04af571979e7d10c60fd7a (diff) | |
| parent | ac9678197fc6142595089155d98442239a64e6d7 (diff) | |
| download | Tango-a65868d1d77b1929b855abd0c19bdc08bc9cee9d.tar.gz Tango-a65868d1d77b1929b855abd0c19bdc08bc9cee9d.zip | |
merge
Diffstat (limited to 'Software/Visual_Studio/Web/Tango.MachineService')
| -rw-r--r-- | Software/Visual_Studio/Web/Tango.MachineService/Controllers/MachineStudioController.cs | 14 | ||||
| -rw-r--r-- | Software/Visual_Studio/Web/Tango.MachineService/Models/MachineStudioPendingUpload.cs | 4 |
2 files changed, 1 insertions, 17 deletions
diff --git a/Software/Visual_Studio/Web/Tango.MachineService/Controllers/MachineStudioController.cs b/Software/Visual_Studio/Web/Tango.MachineService/Controllers/MachineStudioController.cs index 21e3e7eb2..660b98576 100644 --- a/Software/Visual_Studio/Web/Tango.MachineService/Controllers/MachineStudioController.cs +++ b/Software/Visual_Studio/Web/Tango.MachineService/Controllers/MachineStudioController.cs @@ -57,14 +57,7 @@ namespace Tango.MachineService.Controllers MachineStudioVersion latestVersion = null; - if (request.AcceptBetaRelease) - { - latestVersion = versions.OrderByDescending(x => Version.Parse(x.Version)).FirstOrDefault(); - } - else - { - latestVersion = versions.Where(x => x.Stable).OrderByDescending(x => Version.Parse(x.Version)).FirstOrDefault(); - } + latestVersion = versions.OrderByDescending(x => Version.Parse(x.Version)).FirstOrDefault(); Version currentVersion = Version.Parse(request.Version); @@ -81,7 +74,6 @@ namespace Tango.MachineService.Controllers response.IsUpdateAvailable = true; response.Version = latestVersion.Version; response.Comments = latestVersion.Comments; - response.IsStable = latestVersion.Stable; } } else @@ -162,10 +154,8 @@ namespace Tango.MachineService.Controllers { UserGuid = user.Guid, Comments = request.Comments, - ForcedUpdate = request.ForcedUpdate, Token = response.Token, Version = request.Version, - IsStable = request.IsStable, BlobName = blob.Name, }); } @@ -200,8 +190,6 @@ namespace Tango.MachineService.Controllers BlobName = upload.BlobName, UserGuid = upload.UserGuid, Version = upload.Version, - ForceUpdate = upload.ForcedUpdate, - Stable = upload.IsStable, }); db.SaveChanges(); diff --git a/Software/Visual_Studio/Web/Tango.MachineService/Models/MachineStudioPendingUpload.cs b/Software/Visual_Studio/Web/Tango.MachineService/Models/MachineStudioPendingUpload.cs index 0347d35ea..e537d7d44 100644 --- a/Software/Visual_Studio/Web/Tango.MachineService/Models/MachineStudioPendingUpload.cs +++ b/Software/Visual_Studio/Web/Tango.MachineService/Models/MachineStudioPendingUpload.cs @@ -15,12 +15,8 @@ namespace Tango.MachineService.Models public String Comments { get; set; } - public bool ForcedUpdate { get; set; } - public String FilePath { get; set; } - public bool IsStable { get; set; } - public String BlobName { get; set; } } }
\ No newline at end of file |