From f5db8bbbff4e6e6b16c2d082579a74f84a676dad Mon Sep 17 00:00:00 2001 From: Natalia Portillo Date: Sat, 18 May 2019 17:25:23 +0100 Subject: [PATCH] Fix rendering company description. --- cicm_web/Controllers/CompanyController.cs | 2 ++ cicm_web/Views/Company/View.cshtml | 5 ++--- cicm_web/cicm_web.csproj | 2 +- 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/cicm_web/Controllers/CompanyController.cs b/cicm_web/Controllers/CompanyController.cs index 365cbee0..3ecb317c 100644 --- a/cicm_web/Controllers/CompanyController.cs +++ b/cicm_web/Controllers/CompanyController.cs @@ -68,6 +68,8 @@ namespace cicm_web.Controllers if(company == null) return Index(); + ViewBag.CompanyDescription = company.Description?.Text; + return View(company); } diff --git a/cicm_web/Views/Company/View.cshtml b/cicm_web/Views/Company/View.cshtml index 32fc4fd7..30c5bafe 100644 --- a/cicm_web/Views/Company/View.cshtml +++ b/cicm_web/Views/Company/View.cshtml @@ -433,11 +433,10 @@ - @* TODO: This is not working with EF, check why *@ - @if(Model.Description != null) + @if(ViewBag.CompanyDescription != null) {
- @Html.Raw(Model.Description) + @Html.Raw(ViewBag.CompanyDescription)
} diff --git a/cicm_web/cicm_web.csproj b/cicm_web/cicm_web.csproj index 108d03f3..bba0e297 100644 --- a/cicm_web/cicm_web.csproj +++ b/cicm_web/cicm_web.csproj @@ -2,7 +2,7 @@ netcoreapp2.2 - 3.0.99.414 + 3.0.99.418 Canary Islands Computer Museum Copyright © 2003-2018 Natalia Portillo Canary Islands Computer Museum Website