aboutsummaryrefslogtreecommitdiffstats
path: root/Software/Visual_Studio/Web/Tango.MachineService/Controllers
diff options
context:
space:
mode:
authorRoy Ben Shabat <Roy.mail.net@gmail.com>2020-09-25 04:04:52 +0300
committerRoy Ben Shabat <Roy.mail.net@gmail.com>2020-09-25 04:04:52 +0300
commit73d68112321587add7e22d89175fd1f12c34c6d1 (patch)
tree194787c4494d767143caccf1710d2c451a7782ca /Software/Visual_Studio/Web/Tango.MachineService/Controllers
parent531210371305ca4b7039a79f4ad2796189155393 (diff)
downloadTango-73d68112321587add7e22d89175fd1f12c34c6d1.tar.gz
Tango-73d68112321587add7e22d89175fd1f12c34c6d1.zip
Improved Auth2 package and tested.
Dropped "Stack trace not provided" message from TangoController. Retained job user round-trip from MS.
Diffstat (limited to 'Software/Visual_Studio/Web/Tango.MachineService/Controllers')
-rw-r--r--Software/Visual_Studio/Web/Tango.MachineService/Controllers/PPCController.cs4
1 files changed, 1 insertions, 3 deletions
diff --git a/Software/Visual_Studio/Web/Tango.MachineService/Controllers/PPCController.cs b/Software/Visual_Studio/Web/Tango.MachineService/Controllers/PPCController.cs
index 601438d67..2c1c27f52 100644
--- a/Software/Visual_Studio/Web/Tango.MachineService/Controllers/PPCController.cs
+++ b/Software/Visual_Studio/Web/Tango.MachineService/Controllers/PPCController.cs
@@ -533,7 +533,6 @@ namespace Tango.MachineService.Controllers
var job = dto.ToObservable();
job.ID = 0;
- job.UserGuid = dto.UserGuid;
job.CustomerGuid = null;
job.IsSynchronized = true;
@@ -546,6 +545,7 @@ namespace Tango.MachineService.Controllers
}
else if (job.LastUpdated > existingJob.LastUpdated)
{
+ job.UserGuid = existingJob.UserGuid;
existingJob.Delete(db);
db.Jobs.Add(job);
db.SaveChanges();
@@ -571,7 +571,6 @@ namespace Tango.MachineService.Controllers
{
var run = dto.ToObservable();
run.ID = 0;
- run.UserGuid = dto.UserGuid;
run.IsSynchronized = true;
if (db.JobRuns.SingleOrDefault(x => x.Guid == run.Guid) == null)
@@ -600,7 +599,6 @@ namespace Tango.MachineService.Controllers
{
var ev = dto.ToObservable();
ev.ID = 0;
- ev.UserGuid = dto.UserGuid;
ev.IsSynchronized = true;
if (db.MachinesEvents.SingleOrDefault(x => x.Guid == ev.Guid) == null)