Merge pull request #1009 from LeeDumond/fix/model-declarations-in-razor-views

model declarations in razor views resulting in unsolved references
This commit is contained in:
Miguel Veloso 2019-04-30 10:43:09 +01:00 committed by GitHub
commit bb99ae142f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 45 additions and 40 deletions

View File

@ -1,6 +1,8 @@
@model CampaignItem
@{
ViewData["Title"] = "Campaign details";
@model CampaignItem
var headerList= new List<Header>() {
new Header() { Controller = "Catalog", Text = "Back to catalog" },
new Header() { Controller = "Campaigns", Text = "Back to Campaigns" } };

View File

@ -1,6 +1,8 @@
@model WebMVC.ViewModels.CampaignViewModel
@{
ViewData["Title"] = "Campaigns";
@model WebMVC.ViewModels.CampaignViewModel
var headerList= new List<Header>() {
new Header() { Controller = "Catalog", Text = "Back to catalog" } };
}
@ -11,7 +13,7 @@
</div>
</section>
<partial name="_Header" model="headerList"/>
<partial name="_Header" model="headerList" />
<div class="container">
<br />
@ -19,9 +21,9 @@
@if (!ViewData.ModelState.IsValid)
{
<div class="alert alert-warning">
@Html.ValidationSummary(false)
</div>
<div class="alert alert-warning">
@Html.ValidationSummary(false)
</div>
}
<div class="col-md-12">
@ -53,24 +55,24 @@
</div>
</div>
<br />
@if (Model != null && Model.CampaignItems !=null && Model.CampaignItems.Any())
@if (Model != null && Model.CampaignItems !=null && Model.CampaignItems.Any())
{
<div class="card-group esh-campaigns-items row">
@foreach (var catalogItem in Model.CampaignItems)
<div class="card-group esh-campaigns-items row">
@foreach (var catalogItem in Model.CampaignItems)
{
<div class="esh-campaigns-item col-md-4">
<partial name="_campaign" model="catalogItem"/>
</div>
<div class="esh-campaigns-item col-md-4">
<partial name="_campaign" model="catalogItem" />
</div>
}
</div>
</div>
<partial name="_pagination" for="PaginationInfo" />
<partial name="_pagination" for="PaginationInfo" />
}
else
{
<div class="esh-campaigns-items row">
THERE ARE NO CAMPAIGNS
</div>
<div class="esh-campaigns-items row">
THERE ARE NO CAMPAIGNS
</div>
}
</div>

View File

@ -1,6 +1,7 @@
@{
@model Microsoft.eShopOnContainers.WebMVC.ViewModels.CatalogViewModels.IndexViewModel
@{
ViewData["Title"] = "Catalog";
@model Microsoft.eShopOnContainers.WebMVC.ViewModels.CatalogViewModels.IndexViewModel
}
<section class="esh-catalog-hero">
<div class="container">
@ -27,31 +28,31 @@
<br />
@if(ViewBag.BasketInoperativeMsg != null)
{
<div class="alert alert-warning" role="alert">
&nbsp;@ViewBag.BasketInoperativeMsg
</div>
<div class="alert alert-warning" role="alert">
&nbsp;@ViewBag.BasketInoperativeMsg
</div>
}
</div>
@if (Model.CatalogItems.Count() > 0)
{
<partial name="_pagination" for="PaginationInfo" />
<partial name="_pagination" for="PaginationInfo" />
<div class="esh-catalog-items row">
@foreach (var catalogItem in Model.CatalogItems)
<div class="esh-catalog-items row">
@foreach (var catalogItem in Model.CatalogItems)
{
<div class="esh-catalog-item col-md-4">
<partial name="_product" model="catalogItem"/>
</div>
}
<div class="esh-catalog-item col-md-4">
<partial name="_product" model="catalogItem" />
</div>
}
</div>
<partial name="_pagination" for="PaginationInfo"/>
<partial name="_pagination" for="PaginationInfo" />
}
else
{
<div class="esh-catalog-items row">
THERE ARE NO RESULTS THAT MATCH YOUR SEARCH
</div>
<div class="esh-catalog-items row">
THERE ARE NO RESULTS THAT MATCH YOUR SEARCH
</div>
}
</div>