diff --git a/src/Umbraco.Web.UI/Views/Partials/blocklist/default.cshtml b/src/Umbraco.Web.UI/Views/Partials/blocklist/default.cshtml index d5944b93c3..accca2ef37 100644 --- a/src/Umbraco.Web.UI/Views/Partials/blocklist/default.cshtml +++ b/src/Umbraco.Web.UI/Views/Partials/blocklist/default.cshtml @@ -1,6 +1,6 @@ @inherits Umbraco.Cms.Web.Common.Views.UmbracoViewPage @{ - if (!Model.Any()) { return; } + if (Model?.Any() != true) { return; } }
@foreach (var block in Model) diff --git a/src/Umbraco.Web.UI/Views/Partials/grid/bootstrap3-fluid.cshtml b/src/Umbraco.Web.UI/Views/Partials/grid/bootstrap3-fluid.cshtml index 84004929bd..b92734e761 100644 --- a/src/Umbraco.Web.UI/Views/Partials/grid/bootstrap3-fluid.cshtml +++ b/src/Umbraco.Web.UI/Views/Partials/grid/bootstrap3-fluid.cshtml @@ -7,7 +7,7 @@ Razor helpers located at the bottom of this file *@ -@if (Model != null && Model.GetType() == typeof(JObject) && Model.sections != null) +@if (Model is JObject && Model?.sections is not null) { var oneColumn = ((System.Collections.ICollection)Model.sections).Count == 1; @@ -55,7 +55,7 @@
@foreach (var control in area.controls) { - if (control != null && control.editor != null && control.editor.view != null) + if (control?.editor?.view != null) { @await Html.PartialAsync("grid/editors/base", (object)control) } diff --git a/src/Umbraco.Web.UI/Views/Partials/grid/bootstrap3.cshtml b/src/Umbraco.Web.UI/Views/Partials/grid/bootstrap3.cshtml index ebe1cf725f..886378848b 100644 --- a/src/Umbraco.Web.UI/Views/Partials/grid/bootstrap3.cshtml +++ b/src/Umbraco.Web.UI/Views/Partials/grid/bootstrap3.cshtml @@ -3,9 +3,9 @@ @using Newtonsoft.Json.Linq @inherits Umbraco.Cms.Web.Common.Views.UmbracoViewPage -@if (Model != null && Model.GetType() == typeof(JObject) && Model.sections != null) +@if (Model is JObject && Model?.sections is not null) { - var oneColumn = ((System.Collections.ICollection)Model.sections).Count == 1; + var oneColumn = ((System.Collections.ICollection)Model.sections).Count == 1;
@if (oneColumn) @@ -56,7 +56,7 @@
@foreach (var control in area.controls) { - if (control != null && control.editor != null && control.editor.view != null) + if (control?.editor?.view != null) { @await Html.PartialAsync("grid/editors/base", (object)control) } diff --git a/src/Umbraco.Web.UI/Views/Partials/grid/editors/base.cshtml b/src/Umbraco.Web.UI/Views/Partials/grid/editors/base.cshtml index eca6381fd0..05e27e18e5 100644 --- a/src/Umbraco.Web.UI/Views/Partials/grid/editors/base.cshtml +++ b/src/Umbraco.Web.UI/Views/Partials/grid/editors/base.cshtml @@ -3,7 +3,7 @@ @try { string editor = EditorView(Model); - @await Html.PartialAsync(editor, (object)Model) + @await Html.PartialAsync(editor, Model as object) } catch (Exception ex) { diff --git a/src/Umbraco.Web.UI/Views/Partials/grid/editors/embed.cshtml b/src/Umbraco.Web.UI/Views/Partials/grid/editors/embed.cshtml index a383046420..74c8fe2753 100644 --- a/src/Umbraco.Web.UI/Views/Partials/grid/editors/embed.cshtml +++ b/src/Umbraco.Web.UI/Views/Partials/grid/editors/embed.cshtml @@ -1,10 +1,11 @@ -@inherits Umbraco.Cms.Web.Common.Views.UmbracoViewPage +@inherits Umbraco.Cms.Web.Common.Views.UmbracoViewPage -@{ - string embedValue = Convert.ToString(Model.value); - embedValue = embedValue.DetectIsJson() ? Model.value.preview : Model.value; +@if (Model is not null) +{ + string embedValue = Convert.ToString(Model.value); + embedValue = embedValue.DetectIsJson() ? Model.value.preview : Model.value; + +
+ @Html.Raw(embedValue) +
} - -
- @Html.Raw(embedValue) -
diff --git a/src/Umbraco.Web.UI/Views/Partials/grid/editors/macro.cshtml b/src/Umbraco.Web.UI/Views/Partials/grid/editors/macro.cshtml index 0e9661edd9..a4450d1c03 100644 --- a/src/Umbraco.Web.UI/Views/Partials/grid/editors/macro.cshtml +++ b/src/Umbraco.Web.UI/Views/Partials/grid/editors/macro.cshtml @@ -1,6 +1,6 @@ @inherits Umbraco.Cms.Web.Common.Views.UmbracoViewPage -@if (Model.value != null) +@if (Model?.value is not null) { string macroAlias = Model.value.macroAlias.ToString(); var parameters = new Dictionary(); diff --git a/src/Umbraco.Web.UI/Views/Partials/grid/editors/media.cshtml b/src/Umbraco.Web.UI/Views/Partials/grid/editors/media.cshtml index 4cc31d0754..bc3b111332 100644 --- a/src/Umbraco.Web.UI/Views/Partials/grid/editors/media.cshtml +++ b/src/Umbraco.Web.UI/Views/Partials/grid/editors/media.cshtml @@ -2,7 +2,8 @@ @using Umbraco.Cms.Core.Media @using Umbraco.Cms.Core.PropertyEditors.ValueConverters @inject IImageUrlGenerator ImageUrlGenerator -@if (Model.value != null) + +@if (Model?.value is not null) { var url = Model.value.image; diff --git a/src/Umbraco.Web.UI/Views/Partials/grid/editors/rte.cshtml b/src/Umbraco.Web.UI/Views/Partials/grid/editors/rte.cshtml index e14c6e1a97..944566688a 100644 --- a/src/Umbraco.Web.UI/Views/Partials/grid/editors/rte.cshtml +++ b/src/Umbraco.Web.UI/Views/Partials/grid/editors/rte.cshtml @@ -5,7 +5,7 @@ @inject HtmlImageSourceParser HtmlImageSourceParser; @{ - var value = HtmlLocalLinkParser.EnsureInternalLinks(Model.value.ToString()); + var value = HtmlLocalLinkParser.EnsureInternalLinks(Model?.value.ToString()); value = HtmlUrlParser.EnsureUrls(value); value = HtmlImageSourceParser.EnsureImageSources(value); } diff --git a/src/Umbraco.Web.UI/Views/Partials/grid/editors/textstring.cshtml b/src/Umbraco.Web.UI/Views/Partials/grid/editors/textstring.cshtml index 42972f64d8..d4152a59b1 100644 --- a/src/Umbraco.Web.UI/Views/Partials/grid/editors/textstring.cshtml +++ b/src/Umbraco.Web.UI/Views/Partials/grid/editors/textstring.cshtml @@ -1,7 +1,7 @@ -@using System.Web +@using System.Web @model dynamic -@if (Model.editor.config.markup != null) +@if (Model?.editor.config.markup is not null) { string markup = Model.editor.config.markup.ToString(); markup = markup.Replace("#value#", Html.ReplaceLineBreaks((string)Model.value.ToString()).ToString()); @@ -18,6 +18,6 @@ else { -
@Model.value
+
@Model?.value
 } diff --git a/src/Umbraco.Web.UI/umbraco/PartialViewMacros/Templates/Breadcrumb.cshtml b/src/Umbraco.Web.UI/umbraco/PartialViewMacros/Templates/Breadcrumb.cshtml index 30c3feb5c5..6a807e8379 100644 --- a/src/Umbraco.Web.UI/umbraco/PartialViewMacros/Templates/Breadcrumb.cshtml +++ b/src/Umbraco.Web.UI/umbraco/PartialViewMacros/Templates/Breadcrumb.cshtml @@ -1,4 +1,4 @@ -@using Umbraco.Cms.Core.Routing +@using Umbraco.Cms.Core.Routing @using Umbraco.Extensions @inherits Umbraco.Cms.Web.Common.Macros.PartialViewMacroPage @inject IPublishedUrlProvider PublishedUrlProvider @@ -10,9 +10,9 @@ - Finally it outputs the name of the current page (without a link) *@ -@{ var selection = Model.Content.Ancestors().ToArray(); } +@{ var selection = Model?.Content.Ancestors().ToArray(); } -@if (selection.Length > 0) +@if (selection?.Length > 0) {
    @* For each page in the ancestors collection which have been ordered by Level (so we start with the highest top node first) *@ @@ -22,6 +22,6 @@ } @* Display the current page as the last item in the list *@ -
  • @Model.Content.Name
    • +
  • @Model?.Content.Name
} diff --git a/src/Umbraco.Web.UI/umbraco/PartialViewMacros/Templates/Gallery.cshtml b/src/Umbraco.Web.UI/umbraco/PartialViewMacros/Templates/Gallery.cshtml index fec760b5cb..83ac245500 100644 --- a/src/Umbraco.Web.UI/umbraco/PartialViewMacros/Templates/Gallery.cshtml +++ b/src/Umbraco.Web.UI/umbraco/PartialViewMacros/Templates/Gallery.cshtml @@ -24,7 +24,7 @@ Type: (note: You can use a Single Media Picker if that's more appropriate to your needs) *@ -@{ var mediaIds = Model.MacroParameters["mediaIds"] as string; } +@{ var mediaIds = Model?.MacroParameters["mediaIds"] as string; } @if (mediaIds != null) { diff --git a/src/Umbraco.Web.UI/umbraco/PartialViewMacros/Templates/ListAncestorsFromCurrentPage.cshtml b/src/Umbraco.Web.UI/umbraco/PartialViewMacros/Templates/ListAncestorsFromCurrentPage.cshtml index c44965ec85..ead17cfe59 100644 --- a/src/Umbraco.Web.UI/umbraco/PartialViewMacros/Templates/ListAncestorsFromCurrentPage.cshtml +++ b/src/Umbraco.Web.UI/umbraco/PartialViewMacros/Templates/ListAncestorsFromCurrentPage.cshtml @@ -10,9 +10,9 @@ - Finally it outputs the name of the current page (without a link) *@ -@{ var selection = Model.Content.Ancestors().ToArray(); } +@{ var selection = Model?.Content.Ancestors().ToArray(); } -@if (selection.Length > 0) +@if (selection?.Length > 0) {
    @* For each page in the ancestors collection which have been ordered by Level (so we start with the highest top node first) *@ @@ -22,6 +22,6 @@ } @* Display the current page as the last item in the list *@ -
  • @Model.Content.Name
    • +
  • @Model?.Content.Name
} diff --git a/src/Umbraco.Web.UI/umbraco/PartialViewMacros/Templates/ListChildPagesFromChangeableSource.cshtml b/src/Umbraco.Web.UI/umbraco/PartialViewMacros/Templates/ListChildPagesFromChangeableSource.cshtml index 464c05fb78..a53c658364 100644 --- a/src/Umbraco.Web.UI/umbraco/PartialViewMacros/Templates/ListChildPagesFromChangeableSource.cshtml +++ b/src/Umbraco.Web.UI/umbraco/PartialViewMacros/Templates/ListChildPagesFromChangeableSource.cshtml @@ -18,7 +18,7 @@ Alias:startNodeId Name:Select starting page Type:Content Picker *@ -@{ var startNodeId = Model.MacroParameters["startNodeId"]; } +@{ var startNodeId = Model?.MacroParameters["startNodeId"]; } @if (startNodeId != null) { diff --git a/src/Umbraco.Web.UI/umbraco/PartialViewMacros/Templates/ListChildPagesFromCurrentPage.cshtml b/src/Umbraco.Web.UI/umbraco/PartialViewMacros/Templates/ListChildPagesFromCurrentPage.cshtml index 491f90238a..7b055e8424 100644 --- a/src/Umbraco.Web.UI/umbraco/PartialViewMacros/Templates/ListChildPagesFromCurrentPage.cshtml +++ b/src/Umbraco.Web.UI/umbraco/PartialViewMacros/Templates/ListChildPagesFromCurrentPage.cshtml @@ -13,9 +13,9 @@ - It then generates links so the visitor can go to each page *@ -@{ var selection = Model.Content.Children.Where(x => x.IsVisible(PublishedValueFallback)).ToArray(); } +@{ var selection = Model?.Content.Children.Where(x => x.IsVisible(PublishedValueFallback)).ToArray(); } -@if (selection.Length > 0) +@if (selection?.Length > 0) {
    @foreach (var item in selection) diff --git a/src/Umbraco.Web.UI/umbraco/PartialViewMacros/Templates/ListChildPagesOrderedByDate.cshtml b/src/Umbraco.Web.UI/umbraco/PartialViewMacros/Templates/ListChildPagesOrderedByDate.cshtml index b998d917a1..4b07c6209f 100644 --- a/src/Umbraco.Web.UI/umbraco/PartialViewMacros/Templates/ListChildPagesOrderedByDate.cshtml +++ b/src/Umbraco.Web.UI/umbraco/PartialViewMacros/Templates/ListChildPagesOrderedByDate.cshtml @@ -14,9 +14,9 @@ - It then generates links so the visitor can go to each page *@ -@{ var selection = Model.Content.Children.Where(x => x.IsVisible(PublishedValueFallback)).OrderByDescending(x => x.CreateDate).ToArray(); } +@{ var selection = Model?.Content.Children.Where(x => x.IsVisible(PublishedValueFallback)).OrderByDescending(x => x.CreateDate).ToArray(); } -@if (selection.Length > 0) +@if (selection?.Length > 0) {
      @foreach (var item in selection) diff --git a/src/Umbraco.Web.UI/umbraco/PartialViewMacros/Templates/ListChildPagesOrderedByName.cshtml b/src/Umbraco.Web.UI/umbraco/PartialViewMacros/Templates/ListChildPagesOrderedByName.cshtml index ac66ece1ea..f46bbcda80 100644 --- a/src/Umbraco.Web.UI/umbraco/PartialViewMacros/Templates/ListChildPagesOrderedByName.cshtml +++ b/src/Umbraco.Web.UI/umbraco/PartialViewMacros/Templates/ListChildPagesOrderedByName.cshtml @@ -14,9 +14,9 @@ - It then generates links so the visitor can go to each page *@ -@{ var selection = Model.Content.Children.Where(x => x.IsVisible(PublishedValueFallback)).OrderBy(x => x.Name).ToArray(); } +@{ var selection = Model?.Content.Children.Where(x => x.IsVisible(PublishedValueFallback)).OrderBy(x => x.Name).ToArray(); } -@if (selection.Length > 0) +@if (selection?.Length > 0) {
        @foreach (var item in selection) diff --git a/src/Umbraco.Web.UI/umbraco/PartialViewMacros/Templates/ListChildPagesOrderedByProperty.cshtml b/src/Umbraco.Web.UI/umbraco/PartialViewMacros/Templates/ListChildPagesOrderedByProperty.cshtml index f20253bc7f..82b34ca55c 100644 --- a/src/Umbraco.Web.UI/umbraco/PartialViewMacros/Templates/ListChildPagesOrderedByProperty.cshtml +++ b/src/Umbraco.Web.UI/umbraco/PartialViewMacros/Templates/ListChildPagesOrderedByProperty.cshtml @@ -17,13 +17,13 @@ Alias:propertyAlias Name:Property Alias Type:Textbox *@ -@{ var propertyAlias = Model.MacroParameters["propertyAlias"]; } +@{ var propertyAlias = Model?.MacroParameters["propertyAlias"]; } @if (propertyAlias != null) { - var selection = Model.Content.Children.Where(x => x.IsVisible(PublishedValueFallback)).OrderBy(x => x.Value(PublishedValueFallback, propertyAlias.ToString())).ToArray(); + var selection = Model?.Content.Children.Where(x => x.IsVisible(PublishedValueFallback)).OrderBy(x => x.Value(PublishedValueFallback, propertyAlias.ToString())).ToArray(); - if (selection.Length > 0) + if (selection?.Length > 0) {
          @foreach (var item in selection) diff --git a/src/Umbraco.Web.UI/umbraco/PartialViewMacros/Templates/ListChildPagesWithDoctype.cshtml b/src/Umbraco.Web.UI/umbraco/PartialViewMacros/Templates/ListChildPagesWithDoctype.cshtml index 1f78ae43a0..466aeacaa3 100644 --- a/src/Umbraco.Web.UI/umbraco/PartialViewMacros/Templates/ListChildPagesWithDoctype.cshtml +++ b/src/Umbraco.Web.UI/umbraco/PartialViewMacros/Templates/ListChildPagesWithDoctype.cshtml @@ -13,9 +13,9 @@ (You can find the alias of your Document Type by editing it in the Settings section) *@ -@{ var selection = Model.Content.Children(VariationContextAccessor).Where(x => x.IsVisible(PublishedValueFallback)).ToArray(); } +@{ var selection = Model?.Content.Children(VariationContextAccessor).Where(x => x.IsVisible(PublishedValueFallback)).ToArray(); } -@if (selection.Length > 0) +@if (selection?.Length > 0) {
            @foreach (var item in selection) diff --git a/src/Umbraco.Web.UI/umbraco/PartialViewMacros/Templates/ListDescendantsFromCurrentPage.cshtml b/src/Umbraco.Web.UI/umbraco/PartialViewMacros/Templates/ListDescendantsFromCurrentPage.cshtml index 92caf9906d..339c0bc42d 100644 --- a/src/Umbraco.Web.UI/umbraco/PartialViewMacros/Templates/ListDescendantsFromCurrentPage.cshtml +++ b/src/Umbraco.Web.UI/umbraco/PartialViewMacros/Templates/ListDescendantsFromCurrentPage.cshtml @@ -10,10 +10,10 @@ the page currently being viewed by the website visitor, displayed as nested unordered HTML lists. *@ -@{ var selection = Model.Content.Children.Where(x => x.IsVisible(PublishedValueFallback)).ToArray(); } +@{ var selection = Model?.Content.Children.Where(x => x.IsVisible(PublishedValueFallback)).ToArray(); } @* Ensure that the Current Page has children *@ -@if (selection.Length > 0) +@if (selection?.Length > 0) { @* Get the first page in the children, where the property umbracoNaviHide is not True *@ var naviLevel = selection[0].Level; diff --git a/src/Umbraco.Web.UI/umbraco/PartialViewMacros/Templates/ListImagesFromMediaFolder.cshtml b/src/Umbraco.Web.UI/umbraco/PartialViewMacros/Templates/ListImagesFromMediaFolder.cshtml index 2ef595992d..8148612409 100644 --- a/src/Umbraco.Web.UI/umbraco/PartialViewMacros/Templates/ListImagesFromMediaFolder.cshtml +++ b/src/Umbraco.Web.UI/umbraco/PartialViewMacros/Templates/ListImagesFromMediaFolder.cshtml @@ -16,7 +16,7 @@ Alias:mediaId Name:Select folder with images Type:Single Media Picker *@ -@{ var mediaId = Model.MacroParameters["mediaId"]; } +@{ var mediaId = Model?.MacroParameters["mediaId"]; } @if (mediaId != null) { diff --git a/src/Umbraco.Web.UI/umbraco/PartialViewMacros/Templates/LoginStatus.cshtml b/src/Umbraco.Web.UI/umbraco/PartialViewMacros/Templates/LoginStatus.cshtml index bca0a23c43..8f5477bca4 100644 --- a/src/Umbraco.Web.UI/umbraco/PartialViewMacros/Templates/LoginStatus.cshtml +++ b/src/Umbraco.Web.UI/umbraco/PartialViewMacros/Templates/LoginStatus.cshtml @@ -15,7 +15,7 @@ { - @if (Model.Languages != null && Model.Languages.Count() > 1) + @if (Model?.Languages.Any() == true) {
            diff --git a/src/Umbraco.Web.UI/umbraco/UmbracoWebsite/NoNodes.cshtml b/src/Umbraco.Web.UI/umbraco/UmbracoWebsite/NoNodes.cshtml index a19390f8ec..69d8318a1f 100644 --- a/src/Umbraco.Web.UI/umbraco/UmbracoWebsite/NoNodes.cshtml +++ b/src/Umbraco.Web.UI/umbraco/UmbracoWebsite/NoNodes.cshtml @@ -1,4 +1,4 @@ -@using Microsoft.Extensions.Options +@using Microsoft.Extensions.Options @using Umbraco.Cms.Core.Configuration.Models @using Umbraco.Cms.Core.Hosting @using Umbraco.Cms.Core.Routing @@ -31,7 +31,7 @@

            You're seeing this wonderful page because your website doesn't contain any published content yet.

            - Open Umbraco + Open Umbraco