claunia/marechai
1
0
Fork 0
mirror of https://github.com/claunia/marechai.git synced 2025-12-16 19:14:25 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix rendering company description.

Browse Source
This commit is contained in:
Natalia Portillo
2019-05-18 17:25:23 +01:00
parent fb9a86f7e4
commit f5db8bbbff
3 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
cicm_web/Controllers/CompanyController.cs
View File

@@ -68,6 +68,8 @@ namespace cicm_web.Controllers
if(company == null) return Index(); if(company == null) return Index();
ViewBag.CompanyDescription = company.Description?.Text;
return View(company); return View(company);
} }

5
cicm_web/Views/Company/View.cshtml
View File

@@ -433,11 +433,10 @@
</div> </div>
</div> </div>
@* TODO: This is not working with EF, check why *@ @if(ViewBag.CompanyDescription != null)
@if(Model.Description != null)
{ {
<div class="container-fluid row"> <div class="container-fluid row">
@Html.Raw(Model.Description) @Html.Raw(ViewBag.CompanyDescription)
</div> </div>
} }
</div> </div>

2
cicm_web/cicm_web.csproj
View File

@@ -2,7 +2,7 @@
<Project Sdk="Microsoft.NET.Sdk.Web"> <Project Sdk="Microsoft.NET.Sdk.Web">
<PropertyGroup> <PropertyGroup>
<TargetFramework>netcoreapp2.2</TargetFramework> <TargetFramework>netcoreapp2.2</TargetFramework>
<Version>3.0.99.414</Version> <Version>3.0.99.418</Version>
<Company>Canary Islands Computer Museum</Company> <Company>Canary Islands Computer Museum</Company>
<Copyright>Copyright © 2003-2018 Natalia Portillo</Copyright> <Copyright>Copyright © 2003-2018 Natalia Portillo</Copyright>
<Product>Canary Islands Computer Museum Website</Product> <Product>Canary Islands Computer Museum Website</Product>