diff --git a/cicm_web/Areas/Admin/Controllers/MachineFamiliesController.cs b/cicm_web/Areas/Admin/Controllers/MachineFamiliesController.cs index 3fc449df..c739f060 100644 --- a/cicm_web/Areas/Admin/Controllers/MachineFamiliesController.cs +++ b/cicm_web/Areas/Admin/Controllers/MachineFamiliesController.cs @@ -31,6 +31,7 @@ using System.Linq; using System.Threading.Tasks; using Cicm.Database.Models; +using cicm_web.Areas.Admin.Models; using Microsoft.AspNetCore.Authorization; using Microsoft.AspNetCore.Mvc; using Microsoft.AspNetCore.Mvc.Rendering; @@ -54,7 +55,11 @@ namespace cicm_web.Areas.Admin.Controllers public async Task Index() { IIncludableQueryable cicmContext = _context.MachineFamilies.Include(m => m.Company); - return View(await cicmContext.OrderBy(m => m.Company.Name).ThenBy(m => m.Name).ToListAsync()); + return View(await cicmContext.OrderBy(m => m.Company.Name).ThenBy(m => m.Name) + .Select(m => new MachineFamilyViewModel + { + Id = m.Id, Company = m.Company.Name, Name = m.Name + }).ToListAsync()); } // GET: Admin/MachineFamilies/Details/5 diff --git a/cicm_web/Areas/Admin/Models/MachineFamilyViewModel.cs b/cicm_web/Areas/Admin/Models/MachineFamilyViewModel.cs new file mode 100644 index 00000000..8236a52a --- /dev/null +++ b/cicm_web/Areas/Admin/Models/MachineFamilyViewModel.cs @@ -0,0 +1,9 @@ +namespace cicm_web.Areas.Admin.Models +{ + public class MachineFamilyViewModel + { + public string Company; + public int Id; + public string Name; + } +} \ No newline at end of file diff --git a/cicm_web/Areas/Admin/Views/MachineFamilies/Index.cshtml b/cicm_web/Areas/Admin/Views/MachineFamilies/Index.cshtml index e522ad0b..686ebd6e 100644 --- a/cicm_web/Areas/Admin/Views/MachineFamilies/Index.cshtml +++ b/cicm_web/Areas/Admin/Views/MachineFamilies/Index.cshtml @@ -29,8 +29,8 @@ // Copyright © 2003-2018 Natalia Portillo *******************************************************************************/ } -@using Cicm.Database.Models -@model IEnumerable +@using cicm_web.Areas.Admin.Models +@model IEnumerable @{ ViewData["Title"] = "Machine families (Admin)"; @@ -57,11 +57,11 @@ - @foreach(MachineFamily item in Model) + @foreach(MachineFamilyViewModel item in Model) { - @Html.DisplayFor(modelItem => item.Company.Name) + @Html.DisplayFor(modelItem => item.Company) @Html.DisplayFor(modelItem => item.Name) diff --git a/cicm_web/cicm_web.csproj b/cicm_web/cicm_web.csproj index d46c68ac..48009446 100644 --- a/cicm_web/cicm_web.csproj +++ b/cicm_web/cicm_web.csproj @@ -2,7 +2,7 @@ netcoreapp2.2 - 3.0.99.536 + 3.0.99.537 Canary Islands Computer Museum Copyright © 2003-2018 Natalia Portillo Canary Islands Computer Museum Website