aaru-dps/Aaru.Server
1
0
Fork 0
mirror of https://github.com/aaru-dps/Aaru.Server.git synced 2025-12-16 19:24:27 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge tested sequential media when merging uploaded reports.

Browse Source
This commit is contained in:
Natalia Portillo
2019-12-26 23:29:39 +00:00
parent d1b6e03175
commit a76d0aaf8c
2 changed files with 19 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
DiscImageChef.CommonTypes

Submodule DiscImageChef.CommonTypes updated: 88268b5cc8...ce5a8c9b40

18
DiscImageChef.Server/Areas/Admin/Controllers/ReportsController.cs
View File

@@ -256,6 +256,24 @@ namespace DiscImageChef.Server.Areas.Admin.Controllers
_context.Update(masterReport); _context.Update(masterReport);
} }
if(masterReport.SCSI?.SequentialDeviceId != null &&
masterReport.SCSI?.SequentialDeviceId != slaveReport.SCSI?.SequentialDeviceId)
{
foreach(TestedSequentialMedia testedMedia in
_context.TestedSequentialMedia.Where(d => d.SscId == slaveReport.SCSI.SequentialDeviceId))
{
testedMedia.SscId = masterReport.SCSI.SequentialDeviceId;
_context.Update(testedMedia);
}
}
else if(masterReport.SCSI != null &&
masterReport.SCSI?.SequentialDeviceId == null &&
slaveReport.SCSI?.SequentialDeviceId != null)
{
masterReport.SCSI.SequentialDeviceId = slaveReport.SCSI.SequentialDeviceId;
_context.Update(masterReport);
}
_context.Remove(slaveReport); _context.Remove(slaveReport);
_context.SaveChanges(); _context.SaveChanges();