From 8cb92c08a2bce8977af0f3833d5ff5b4cbb340a7 Mon Sep 17 00:00:00 2001
From: Chris Woodward <cwoodward@brightmetrics.com>
Date: Wed, 25 Jul 2018 09:20:49 -0700
Subject: [PATCH] Added username to upload results in admin

---
 Teknik/Areas/Admin/Controllers/AdminController.cs   |  1 +
 .../Areas/Admin/ViewModels/UploadResultViewModel.cs |  5 +++--
 Teknik/Areas/Admin/Views/Admin/UploadResult.cshtml  | 13 +++++++++++--
 3 files changed, 15 insertions(+), 4 deletions(-)

diff --git a/Teknik/Areas/Admin/Controllers/AdminController.cs b/Teknik/Areas/Admin/Controllers/AdminController.cs
index f3b5706..a39acdb 100644
--- a/Teknik/Areas/Admin/Controllers/AdminController.cs
+++ b/Teknik/Areas/Admin/Controllers/AdminController.cs
@@ -105,6 +105,7 @@ namespace Teknik.Areas.Admin.Controllers
                 model.DateUploaded = foundUpload.DateUploaded;
                 model.Downloads = foundUpload.Downloads;
                 model.DeleteKey = foundUpload.DeleteKey;
+                model.Username = foundUpload.User?.Username;
 
                 return Json(new { result = new { html = PartialView("~/Areas/Admin/Views/Admin/UploadResult.cshtml", model).RenderToString() } });
             }
diff --git a/Teknik/Areas/Admin/ViewModels/UploadResultViewModel.cs b/Teknik/Areas/Admin/ViewModels/UploadResultViewModel.cs
index 91af46f..a2871b2 100644
--- a/Teknik/Areas/Admin/ViewModels/UploadResultViewModel.cs
+++ b/Teknik/Areas/Admin/ViewModels/UploadResultViewModel.cs
@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Web;
@@ -14,5 +14,6 @@ namespace Teknik.Areas.Admin.ViewModels
         public DateTime DateUploaded { get; set; }
         public int Downloads { get; set; }
         public string DeleteKey { get; set; }
+        public string Username { get; set; }
     }
-}
\ No newline at end of file
+}
diff --git a/Teknik/Areas/Admin/Views/Admin/UploadResult.cshtml b/Teknik/Areas/Admin/Views/Admin/UploadResult.cshtml
index 006e5a5..e9a37ce 100644
--- a/Teknik/Areas/Admin/Views/Admin/UploadResult.cshtml
+++ b/Teknik/Areas/Admin/Views/Admin/UploadResult.cshtml
@@ -7,15 +7,24 @@
         <a id="upload-url" href="@Url.SubRouteUrl("u", "Upload.Download", new { file = Model.Url })">@Url.SubRouteUrl("u", "Upload.Download", new { file = Model.Url })</a>
     </div>
     <div class="panel-body">
+        <div class="col-sm-2 text-center">
+            <label for="type">Username</label>
+            <p id="type">
+            @if (!string.IsNullOrEmpty(Model.Username))
+            { 
+                @:<a href="@Url.SubRouteUrl("admin", "Admin.UserInfo", new { username = Model.Username })">@Model.Username</a>
+            }
+            </p>
+        </div>
         <div class="col-sm-2 text-center">
             <label for="size">Size</label>
             <p id="size">@StringHelper.GetBytesReadable(Model.ContentLength)</p>
         </div>
-        <div class="col-sm-3 text-center">
+        <div class="col-sm-2 text-center">
             <label for="type">Type</label>
             <p id="type">@Model.ContentType</p>
         </div>
-        <div class="col-sm-3 text-center">
+        <div class="col-sm-2 text-center">
             <label for="dateUploaded">Date Uploaded</label>
             <p id="dateUploaded"><time datetime="@Model.DateUploaded.ToString("s")">@Model.DateUploaded.ToString("MMMM dd, yyyy")</time></p>
         </div>