approval changes

kontent-ai · Oct 26, 2020 · 070d7dd · 070d7dd
1 parent a40f8e6
commit 070d7dd
Show file tree

Hide file tree

Showing 6 changed files with 8 additions and 6 deletions.
diff --git a/kontent-sample-app-razorpages/.config/dotnet-tools.json b/kontent-sample-app-razorpages/.config/dotnet-tools.json
@@ -3,7 +3,7 @@
   "isRoot": true,
   "tools": {
     "kentico.kontent.modelgenerator": {
-      "version": "5.0.0-beta2",
+      "version": "6.0.0",
       "commands": [
         "KontentModelGenerator"
       ]

diff --git a/kontent-sample-app-razorpages/Models/Article.Generated.cs b/kontent-sample-app-razorpages/Models/Article.Generated.cs
@@ -6,7 +6,6 @@
 
 using System;
 using System.Collections.Generic;
-using System.ComponentModel.DataAnnotations;
 using Kentico.Kontent.Delivery.Abstractions;
 
 namespace kontent_sample_app_razorpages.Models
@@ -36,7 +35,7 @@ public partial class Article
         public const string TitleCodename = "title";
         public const string UrlPatternCodename = "url_pattern";
 
-        public string BodyCopy { get; set; }
+        public IRichTextContent BodyCopy { get; set; }
         public string MetadataMetaDescription { get; set; }
         public string MetadataMetaTitle { get; set; }
         public string MetadataOgDescription { get; set; }
@@ -50,7 +49,6 @@ public partial class Article
         public string MetaDescription { get; set; }
         public string MetaKeywords { get; set; }
         public IEnumerable<ITaxonomyTerm> Personas { get; set; }
-        [DisplayFormat(DataFormatString = "{0:MMM. dd, yyyy}")]
         public DateTime? PostDate { get; set; }
         public IEnumerable<object> RelatedArticles { get; set; }
         public IEnumerable<ITaxonomyTerm> Sitemap { get; set; }

diff --git a/kontent-sample-app-razorpages/Models/Article.cs b/kontent-sample-app-razorpages/Models/Article.cs
@@ -1,10 +1,13 @@
 using System;
 using System.Collections.Generic;
 using Kentico.Kontent.Delivery.Abstractions;
+using Newtonsoft.Json;
 
 namespace kontent_sample_app_razorpages.Models
 {
     public partial class Article
     {
+        [JsonProperty("body_copy")]
+        public string BodyCopyString { get; set; }
     }
 }
diff --git a/kontent-sample-app-razorpages/Pages/Articles/Detail.cshtml b/kontent-sample-app-razorpages/Pages/Articles/Detail.cshtml
@@ -21,7 +21,7 @@
             </div>
             <div class="row">
                 <div class="article-detail-content">
-                    @Html.Raw(Model.Article.BodyCopy)
+                    @Html.Raw(Model.Article.BodyCopyString)
                 </div>
             </div>
         </article>

diff --git a/kontent-sample-app-razorpages/Tools/GenerateModels.ps1 b/kontent-sample-app-razorpages/Tools/GenerateModels.ps1
@@ -1,3 +1,3 @@
 dotnet tool restore
 $OUTPUT_PATH = Join-Path $PSScriptRoot "..\Models"
-dotnet tool run KontentModelGenerator -p "975bf280-fd91-488c-994c-2f04416e5ee3" -o $OUTPUT_PATH -n "kontent_sample_app_razorpages.Models" -g=false -s=true
+dotnet tool run KontentModelGenerator -p "975bf280-fd91-488c-994c-2f04416e5ee3" -o $OUTPUT_PATH -n "kontent_sample_app_razorpages.Models" -s=true
diff --git a/kontent-sample-app-razorpages/kontent-sample-app-razorpages.csproj b/kontent-sample-app-razorpages/kontent-sample-app-razorpages.csproj
@@ -5,6 +5,7 @@
     <AspNetCoreHostingModel>InProcess</AspNetCoreHostingModel>
     <RootNamespace>kontent_sample_app_razorpages</RootNamespace>
     <AssemblyName>kontent-sample-app-razorpages</AssemblyName>
+    <UserSecretsId>fdbd2a40-72c9-4f17-9a13-bffb343ae2ea</UserSecretsId>
   </PropertyGroup>