Permissions & Authorization for Users #24

Initial Release; Includes Database and MVC refactoring

Disco.Web/Areas/Config/Models/DeviceBatch/IndexModel.cs

@@ -11,10 +11,10 @@ namespace Disco.Web.Areas.Config.Models.DeviceBatch
     {
         public List<ConfigDeviceBatchIndexModelItem> DeviceBatches { get; set; }
 
-        public static IndexModel Build(DiscoDataContext dbContext)
+        public static IndexModel Build(DiscoDataContext Database)
         {
             var m = new IndexModel();
-            m.DeviceBatches = dbContext.DeviceBatches.OrderBy(db => db.Name).Select(db => new _IndexModelItem()
+            m.DeviceBatches = Database.DeviceBatches.OrderBy(db => db.Name).Select(db => new _IndexModelItem()
             {
                 Id = db.Id,
                 Name = db.Name,
@@ -28,6 +28,9 @@ namespace Disco.Web.Areas.Config.Models.DeviceBatch
                 InsuredUntil = db.InsuredUntil
             }).ToArray().Cast<ConfigDeviceBatchIndexModelItem>().ToList();
 
+            foreach (var item in m.DeviceBatches.Where(db => db.DefaultDeviceModel == null))
+                item.DefaultDeviceModel = "<None Specified>";
+
             return m;
         }
 

Disco.Web/Areas/Config/Models/DeviceBatch/ShowModel.cs

@@ -10,6 +10,7 @@ namespace Disco.Web.Areas.Config.Models.DeviceBatch
     public class ShowModel : ConfigDeviceBatchShowModel
     {
         public Disco.Models.Repository.DeviceBatch DeviceBatch { get; set; }
+        public Disco.Models.Repository.DeviceModel DefaultDeviceModel { get; set; }
         public List<Disco.Models.Repository.DeviceModel> DeviceModels { get; set; }
         public List<ConfigDeviceBatchShowModelMembership> DeviceModelMembers { get; set; }
         public int DeviceCount { get; set; }