From e245356c722792f8c23aa483cb323f4c47b54fb6 Mon Sep 17 00:00:00 2001 From: Roy Ben-Shabat Date: Sun, 10 Feb 2019 13:32:03 +0200 Subject: Added new event types. Remove IsStable and AcceptBetaRelease from machine studio. --- .../Controllers/MachineStudioController.cs | 14 +------------- .../Models/MachineStudioPendingUpload.cs | 4 ---- 2 files changed, 1 insertion(+), 17 deletions(-) (limited to 'Software/Visual_Studio/Web/Tango.MachineService') 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 -- cgit v1.3.1