Merge branch 'master' of https://twinetfs.visualstudio.com/Tango/_git/Tango

1 files changed, 27 insertions, 2 deletions

diff --git a/Software/Visual_Studio/Web/Tango.MachineService/Controllers/DownloadsController.cs b/Software/Visual_Studio/Web/Tango.MachineService/Controllers/DownloadsController.cs
index 126b794ea..ecdbf662c 100644
--- a/Software/Visual_Studio/Web/Tango.MachineService/Controllers/DownloadsController.cs
+++ b/Software/Visual_Studio/Web/Tango.MachineService/Controllers/DownloadsController.cs
@@ -3,15 +3,40 @@ using System.Collections.Generic;
 using System.Linq;
 using System.Web;
 using System.Web.Mvc;
+using Tango.MachineService.Filters;
+using Tango.MachineService.Models;
+using Tango.MachineService.Views.Downloads;
 
 namespace Tango.MachineService.Controllers
 {
     public class DownloadsController : Controller
     {
-        // GET: Downloads
+        [Authorize]
         public ActionResult Index()
         {
-            return View();
+            List<DownloadModel> downloads = new List<DownloadModel>();
+            for (int i = 0; i < 10; i++)
+            {
+                downloads.Add(new DownloadModel()
+                {
+                    Name = "Downloads " + i,
+                    Comments = "Some comments...\nWith a new line",
+                    Date = DateTime.Now.ToString(),
+                    User = "Roy",
+                    ID = i.ToString(),
+                });
+            }
+
+            IndexViewModel model = new IndexViewModel();
+            model.Downloads = downloads;
+
+            return View(model);
+        }
+
+        [Authorize]
+        public ActionResult Download(String id)
+        {
+            return File(new byte[] { 25, 255, 255 }, System.Net.Mime.MediaTypeNames.Application.Octet,"Machine Studio v1.0.exe");
         }
     }
 }
\ No newline at end of file