Merge branch 'develop' into stable

1 files changed, 8 insertions, 1 deletions

diff --git a/src/SMAPI.Web/ViewModels/LogParserModel.cs b/src/SMAPI.Web/ViewModels/LogParserModel.cs
index b5b3b14c..8c026536 100644
--- a/src/SMAPI.Web/ViewModels/LogParserModel.cs
+++ b/src/SMAPI.Web/ViewModels/LogParserModel.cs
@@ -1,3 +1,5 @@
+using StardewModdingAPI.Web.Framework.LogParsing.Models;
+
 namespace StardewModdingAPI.Web.ViewModels
 {
     /// <summary>The view model for the log parser page.</summary>
@@ -12,6 +14,9 @@ namespace StardewModdingAPI.Web.ViewModels
         /// <summary>The paste ID.</summary>
         public string PasteID { get; set; }
 
+        /// <summary>The parsed log info.</summary>
+        public ParsedLog ParsedLog { get; set; }
+
 
         /*********
         ** Public methods
@@ -22,10 +27,12 @@ namespace StardewModdingAPI.Web.ViewModels
         /// <summary>Construct an instance.</summary>
         /// <param name="sectionUrl">The root URL for the log parser controller.</param>
         /// <param name="pasteID">The paste ID.</param>
-        public LogParserModel(string sectionUrl, string pasteID)
+        /// <param name="parsedLog">The parsed log info.</param>
+        public LogParserModel(string sectionUrl, string pasteID, ParsedLog parsedLog)
         {
             this.SectionUrl = sectionUrl;
             this.PasteID = pasteID;
+            this.ParsedLog = parsedLog;
         }
     }
 }