From f49a5d74f4ff9def372338286a25449ac1383657 Mon Sep 17 00:00:00 2001
From: sfmskywalker <sipke@ideliverable.com>
Date: Mon, 26 May 2014 02:16:32 +0200
Subject: [PATCH] Improving variable names and executing queries early on for
 easier debugging.

---
 .../Orchard.AuditTrail/Controllers/AdminController.cs    | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/src/Orchard.Web/Modules/Orchard.AuditTrail/Controllers/AdminController.cs b/src/Orchard.Web/Modules/Orchard.AuditTrail/Controllers/AdminController.cs
index 2e3a76160..02353d50f 100644
--- a/src/Orchard.Web/Modules/Orchard.AuditTrail/Controllers/AdminController.cs
+++ b/src/Orchard.Web/Modules/Orchard.AuditTrail/Controllers/AdminController.cs
@@ -40,11 +40,12 @@ namespace Orchard.AuditTrail.Controllers {
                 To = _dateServices.ConvertFromLocalString(filterParameters.To.Date, filterParameters.To.Time),
             }, filterParameters.OrderBy);
             var pagerShape = New.Pager(pager).TotalItemCount(pageOfData.TotalItemCount);
-            var eventDescriptors = from c in _auditTrailManager.Describe()
+            var eventDescriptorsQuery = from c in _auditTrailManager.Describe()
                                    from e in c.Events
                                    select e;
-            var recordViewModels = from record in pageOfData
-                                   let descriptor = eventDescriptors.FirstOrDefault(x => x.Event == record.Event)
+            var eventDescriptors = eventDescriptorsQuery.ToDictionary(x => x.Event);
+            var recordViewModelsQuery = from record in pageOfData
+                                   let descriptor = eventDescriptors.ContainsKey(record.Event) ? eventDescriptors[record.Event] : default(AuditTrailEventDescriptor)
                                    where descriptor != null
                                    select new AuditTrailEventSummaryViewModel {
                                        Record = record,
@@ -54,7 +55,7 @@ namespace Orchard.AuditTrail.Controllers {
                                    };
 
             var viewModel = new AuditTrailViewModel {
-                Records = recordViewModels,
+                Records = recordViewModelsQuery.ToArray(),
                 Pager = pagerShape,
                 Filter = filterParameters
             };