Logs in dashboard display as raw file instead of list

rxtur · rxtur · commit cd70b5c714d1 · 2015-11-26T23:40:10.000-06:00
diff --git a/BlogEngine/BlogEngine.Core/Data/ViewModels/DashboardVM.cs b/BlogEngine/BlogEngine.Core/Data/ViewModels/DashboardVM.cs
@@ -102,11 +102,11 @@ public List<QuickNote> Notes
         /// <summary>
         /// Log items counter
         /// </summary>
-        public List<SelectOption> Logs
+        public string Logs
         {
             get
             {
-                return GetLogFile().ToList();
+                return GetLogFile();
             }
         }
 
@@ -216,7 +216,7 @@ private void LoadTrash()
             Trash = _trash;
         }
 
-        IEnumerable<SelectOption> GetLogFile()
+        IEnumerable<SelectOption> GetLogs()
         {
             string fileLocation = HostingEnvironment.MapPath(Path.Combine(BlogConfig.StorageLocation, "logger.txt"));
             var items = new List<SelectOption>();
@@ -259,6 +259,24 @@ IEnumerable<SelectOption> GetLogFile()
             }
         }
 
+        string GetLogFile()
+        {
+            string fileLocation = HostingEnvironment.MapPath(Path.Combine(BlogConfig.StorageLocation, "logger.txt"));
+            var items = new List<SelectOption>();
+
+            if (File.Exists(fileLocation))
+            {
+                using (var sw = new StreamReader(fileLocation))
+                {
+                    return sw.ReadToEnd();
+                }
+            }
+            else
+            {
+                return string.Empty;
+            }
+        }
+
         #endregion
     }
 }
diff --git a/BlogEngine/BlogEngine.Core/Properties/AssemblyInfo.cs b/BlogEngine/BlogEngine.Core/Properties/AssemblyInfo.cs
@@ -19,5 +19,5 @@
 [assembly: CLSCompliant(false)]
 [assembly: ComVisible(false)]
 [assembly: AllowPartiallyTrustedCallers]
-[assembly: AssemblyVersion("3.1.4.0")]
+[assembly: AssemblyVersion("3.1.4.1")]
 [assembly: SecurityRules(SecurityRuleSet.Level1)]
diff --git a/BlogEngine/BlogEngine.NET/admin/app/dashboard/dashboardView.html b/BlogEngine/BlogEngine.NET/admin/app/dashboard/dashboardView.html
@@ -7,11 +7,9 @@
                     <h4 class="modal-title">{{lbl.logFile}}</h4>
                 </div>
                 <div class="modal-body logs-list">
-                    <ul class="list-group">
-                        <li class="list-group-item" data-ng-repeat="log in vm.Logs">
-                            <div ng-bind-html="log.OptionValue"></div>
-                        </li>
-                    </ul>
+                    <div class="form-group">
+                        <textarea ng-bind="vm.Logs" rows="12" maxlength="450" class="form-control" id="txtLogs"></textarea>
+                    </div>
                     <div class="modal-buttons text-right">
                         <button type="button" data-ng-if="vm.Logs.length > 0" data-ng-click="purgeLog()" class="btn btn-hasicon btn-danger"><i class="fa fa-trash"></i> {{lbl.purge}}</button>
                         <button type="button" class="btn btn-default" data-dismiss="modal">{{lbl.close}}</button>
@@ -46,7 +44,7 @@ <h4 class="modal-title">{{lbl.trash}}</h4>
     <div class="page-header clearfix">
         <div class="page-title pull-left">{{lbl.dashboard}}</div>
         <a ng-click="openTrash()" ng-if="vm.Trash.length > 0" class="icon-header-dashboard icon-header-trash pull-right" angular-tooltip tooltip="lbl.trash"><i class="fa fa-trash-o"></i> <span>{{vm.Trash.length}}</span></a>
-        <a ng-click="openLogFile()" ng-if="vm.Logs.length > 0" class="icon-header-dashboard icon-header-logs pull-right" angular-tooltip tooltip="lbl.logs"><i class="fa fa-warning"></i> <span>{{vm.Logs.length}}</span></a>
+        <a ng-click="openLogFile()" ng-if="vm.Logs.length > 0" class="icon-header-dashboard icon-header-logs pull-right" angular-tooltip tooltip="lbl.logs"><i class="fa fa-warning"></i></a>
     </div>
     <div class="content-inner content-dashboard">
         <div class="version-alert" id="versionMsg">

Original file line number	Diff line number	Diff line change
`@@ -102,11 +102,11 @@ public List<QuickNote> Notes`
`102`	`102`	`/// <summary>`
`103`	`103`	`/// Log items counter`
`104`	`104`	`/// </summary>`
`105`		`- public List<SelectOption> Logs`
	`105`	`+ public string Logs`
`106`	`106`	`{`
`107`	`107`	`get`
`108`	`108`	`{`
`109`		`- return GetLogFile().ToList();`
	`109`	`+ return GetLogFile();`
`110`	`110`	`}`
`111`	`111`	`}`
`112`	`112`
`@@ -216,7 +216,7 @@ private void LoadTrash()`
`216`	`216`	`Trash = _trash;`
`217`	`217`	`}`
`218`	`218`
`219`		`- IEnumerable<SelectOption> GetLogFile()`
	`219`	`+ IEnumerable<SelectOption> GetLogs()`
`220`	`220`	`{`
`221`	`221`	`string fileLocation = HostingEnvironment.MapPath(Path.Combine(BlogConfig.StorageLocation, "logger.txt"));`
`222`	`222`	`var items = new List<SelectOption>();`
`@@ -259,6 +259,24 @@ IEnumerable<SelectOption> GetLogFile()`
`259`	`259`	`}`
`260`	`260`	`}`
`261`	`261`
	`262`	`+ string GetLogFile()`
	`263`	`+ {`
	`264`	`+ string fileLocation = HostingEnvironment.MapPath(Path.Combine(BlogConfig.StorageLocation, "logger.txt"));`
	`265`	`+ var items = new List<SelectOption>();`
	`266`	`+`
	`267`	`+ if (File.Exists(fileLocation))`
	`268`	`+ {`
	`269`	`+ using (var sw = new StreamReader(fileLocation))`
	`270`	`+ {`
	`271`	`+ return sw.ReadToEnd();`
	`272`	`+ }`
	`273`	`+ }`
	`274`	`+ else`
	`275`	`+ {`
	`276`	`+ return string.Empty;`
	`277`	`+ }`
	`278`	`+ }`
	`279`	`+`
`262`	`280`	`#endregion`
`263`	`281`	`}`
`264`	`282`	`}`