jessikitty/Disco
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

#138 add/remove individual device flags UI

Browse Source
This commit is contained in:
Gary Sharp
2024-01-14 18:29:58 +11:00
parent 6ce6e2cccf
commit aee467cb53
15 changed files with 1573 additions and 68 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Disco.Web/Controllers/DeviceController.cs
+24 -10
View File
@@ -4,6 +4,7 @@ using Disco.Models.Services.Jobs.JobLists;
using Disco.Models.UI.Device;
using Disco.Services;
using Disco.Services.Authorization;
using Disco.Services.Devices.DeviceFlags;
using Disco.Services.Exporting;
using Disco.Services.Interop.ActiveDirectory;
using Disco.Services.Plugins.Features.DetailsProvider;
@@ -12,6 +13,7 @@ using Disco.Services.Users;
using Disco.Services.Web;
using System;
using System.Collections.Generic;
using System.Data.Entity;
using System.Linq;
using System.Web;
using System.Web.Mvc;
@@ -226,16 +228,18 @@ namespace Disco.Web.Controllers
Database.Configuration.LazyLoadingEnabled = true;
m.Device = Database.Devices
.Include("DeviceModel")
.Include("DeviceProfile")
.Include("DeviceBatch")
.Include("DeviceDetails")
.Include("DeviceUserAssignments.AssignedUser.UserFlagAssignments")
.Include("AssignedUser.UserFlagAssignments")
.Include("AssignedUser.UserDetails")
.Include("DeviceCertificates")
.Include("DeviceAttachments.TechUser")
.Include("DeviceAttachments.DocumentTemplate")
.Include(d => d.DeviceModel)
.Include(d => d.DeviceProfile)
.Include(d => d.DeviceBatch)
.Include(d => d.DeviceDetails)
.Include(d => d.DeviceUserAssignments.Select(a => a.AssignedUser.UserFlagAssignments))
.Include(d => d.AssignedUser.UserFlagAssignments)
.Include(d => d.AssignedUser.UserDetails)
.Include(d => d.DeviceCertificates)
.Include(d => d.DeviceAttachments.Select(a => a.TechUser))
.Include(d => d.DeviceAttachments.Select(a => a.DocumentTemplate))
.Include(d => d.DeviceFlagAssignments.Select(a => a.AddedUser))
.Include(d => d.DeviceFlagAssignments.Select(a => a.RemovedUser))
.FirstOrDefault(d => d.SerialNumber == id);
if (m.Device == null)
@@ -310,6 +314,16 @@ namespace Disco.Web.Controllers
m.DeviceProfileWirelessProfileProviders = m.Device.DeviceProfile.GetWirelessProfileProviders().ToList();
}
if (Authorization.Has(Claims.Device.ShowFlagAssignments))
{
var usedFlags = m.Device.DeviceFlagAssignments
.Where(a => !a.RemovedDate.HasValue)
.Select(a => a.DeviceFlagId)
.Distinct().ToList();
m.AvailableDeviceFlags = DeviceFlagService.GetDeviceFlags().Where(f => !usedFlags.Contains(f.Id)).ToList();
}
if (Authorization.Has(Claims.User.ShowDetails))
{
// Populate Custom Details
Disco.Web/Controllers/UserController.cs
+11 -10
View File
@@ -10,6 +10,7 @@ using Disco.Services.Users;
using Disco.Services.Users.UserFlags;
using Disco.Services.Web;
using System;
using System.Data.Entity;
using System.Linq;
using System.Web.Mvc;
@@ -54,15 +55,15 @@ namespace Disco.Web.Controllers
}
m.User = Database.Users
.Include("DeviceUserAssignments.Device.DeviceModel")
.Include("DeviceUserAssignments.Device.DeviceProfile")
.Include("DeviceUserAssignments.Device.DeviceBatch")
.Include("DeviceUserAssignments.Device.DeviceDetails")
.Include("UserAttachments.TechUser")
.Include("UserAttachments.DocumentTemplate")
.Include("UserFlagAssignments.AddedUser")
.Include("UserFlagAssignments.RemovedUser")
.Include("UserDetails")
.Include(u => u.DeviceUserAssignments.Select(dua => dua.Device.DeviceModel))
.Include(u => u.DeviceUserAssignments.Select(dua => dua.Device.DeviceProfile))
.Include(u => u.DeviceUserAssignments.Select(dua => dua.Device.DeviceBatch))
.Include(u => u.DeviceUserAssignments.Select(dua => dua.Device.DeviceDetails))
.Include(u => u.UserAttachments.Select(ua => ua.TechUser))
.Include(u => u.UserAttachments.Select(ua => ua.DocumentTemplate))
.Include(u => u.UserFlagAssignments.Select(ufa => ufa.AddedUser))
.Include(u => u.UserFlagAssignments.Select(ufa => ufa.RemovedUser))
.Include(u => u.UserDetails)
.FirstOrDefault(um => um.UserId == id);
if (m.User == null)
@@ -79,7 +80,7 @@ namespace Disco.Web.Controllers
HideClosedJobs = true,
EnablePaging = false
};
m.Jobs.Fill(Database, Disco.Services.Searching.Search.BuildJobTableModel(Database).Where(j => j.UserId == id).OrderByDescending(j => j.Id), true);
m.Jobs.Fill(Database, Services.Searching.Search.BuildJobTableModel(Database).Where(j => j.UserId == id).OrderByDescending(j => j.Id), true);
}
if (Authorization.Has(Claims.User.ShowFlagAssignments))