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

Link read capabilities on uploaded report details.

Browse Source
This commit is contained in:
Natalia Portillo
2019-11-23 23:34:11 +00:00
parent 582288bc06
commit e02022a1f8
3 changed files with 15 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -30,10 +30,11 @@ namespace DiscImageChef.Server.Areas.Admin.Controllers
var model = new UploadedReportDetails var model = new UploadedReportDetails
{ {
Report = await _context.Reports.Include(d => d.ATA).Include(d => d.ATAPI).Include(d => d.SCSI). Report = await _context.Reports.Include(d => d.ATA).Include(d => d.ATA.ReadCapabilities).
Include(d => d.MultiMediaCard).Include(d => d.SecureDigital). Include(d => d.ATAPI).Include(d => d.SCSI).
Include(d => d.USB).Include(d => d.FireWire).Include(d => d.PCMCIA). Include(d => d.SCSI.ReadCapabilities).Include(d => d.MultiMediaCard).
FirstOrDefaultAsync(m => m.Id == id) Include(d => d.SecureDigital).Include(d => d.USB).Include(d => d.FireWire).
Include(d => d.PCMCIA).FirstOrDefaultAsync(m => m.Id == id)
}; };
if(model.Report is null) if(model.Report is null)
@@ -63,6 +64,9 @@ namespace DiscImageChef.Server.Areas.Admin.Controllers
d.Revision == model.Report.Revision && d.Id != id). d.Revision == model.Report.Revision && d.Id != id).
Select(d => d.Id).Where(d => model.SameAll.All(r => r != d)).ToList(); Select(d => d.Id).Where(d => model.SameAll.All(r => r != d)).ToList();
model.ReadCapabilitiesId =
model.Report.ATA?.ReadCapabilities?.Id ?? model.Report.SCSI?.ReadCapabilities?.Id ?? 0;
return View(model); return View(model);
} }

6
DiscImageChef.Server/Areas/Admin/Views/Reports/Details.cshtml
View File

@@ -51,6 +51,12 @@
<a asp-action="Promote" asp-route-id="@Model.Report.Id" class="btn btn-secondary">Promote</a> <a asp-action="Promote" asp-route-id="@Model.Report.Id" class="btn btn-secondary">Promote</a>
<a asp-action="Index" class="btn btn-secondary">Back to List</a> <a asp-action="Index" class="btn btn-secondary">Back to List</a>
</div> </div>
@if (Model.ReadCapabilitiesId != 0)
{
<div>
<a asp-controller="TestedMedias" asp-action="Details" asp-route-id="@Model.ReadCapabilitiesId" target="_blank">Read capabilities</a>
</div>
}
@if (Model.Report.ATA != null) @if (Model.Report.ATA != null)
{ {
<div> <div>

1
DiscImageChef.Server/Models/UploadedReportDetails.cs
View File

@@ -9,5 +9,6 @@ namespace DiscImageChef.Server.Models
public List<int> SameButManufacturer { get; set; } public List<int> SameButManufacturer { get; set; }
public List<int> ReportAll { get; set; } public List<int> ReportAll { get; set; }
public List<int> ReportButManufacturer { get; set; } public List<int> ReportButManufacturer { get; set; }
public int ReadCapabilitiesId { get; set; }
} }
} }