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

feature: user details are individually exported; shared export field renderer

Browse Source
This commit is contained in:
Gary Sharp
2025-02-26 13:23:24 +11:00
parent 539503133a
commit a9687b5f25
65 changed files with 1559 additions and 2743 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Disco.Web/Areas/API/Controllers/DeviceController.cs
+9 -7
View File
@@ -687,21 +687,21 @@ namespace Disco.Web.Areas.API.Controllers
[DiscoAuthorize(Claims.Device.Actions.Export)]
[HttpPost, ValidateAntiForgeryToken]
public virtual ActionResult Export(ExportModel Model)
public virtual ActionResult Export(ExportModel model)
{
if (Model == null || Model.Options == null)
if (model == null || model.Options == null)
throw new ArgumentNullException("Model");
// Write Options to Configuration
Database.DiscoConfiguration.Devices.LastExportOptions = Model.Options;
Database.DiscoConfiguration.Devices.LastExportOptions = model.Options;
Database.SaveChanges();
// Start Export
var exportContext = new DeviceExport(Model.Options);
var exportContext = new DeviceExport(model.Options);
var taskContext = ExportTask.ScheduleNowCacheResult(exportContext, id => Url.Action(MVC.Device.Export(id, null, null)));
// Try waiting for completion
if (taskContext.TaskStatus.WaitUntilFinished(TimeSpan.FromSeconds(1)))
if (taskContext.TaskStatus.WaitUntilFinished(TimeSpan.FromSeconds(2)))
return RedirectToAction(MVC.Device.Export(taskContext.Id, null, null));
else
return RedirectToAction(MVC.Config.Logging.TaskStatus(taskContext.TaskStatus.SessionId));
@@ -729,9 +729,11 @@ namespace Disco.Web.Areas.API.Controllers
[DiscoAuthorizeAll(Claims.Config.ManageSavedExports, Claims.Device.Actions.Export)]
[HttpPost, ValidateAntiForgeryToken]
public virtual ActionResult SaveExport(ExportModel Model)
public virtual ActionResult SaveExport(ExportModel model)
{
var export = new DeviceExport(Model.Options);
Database.DiscoConfiguration.Devices.LastExportOptions = model.Options;
var export = new DeviceExport(model.Options);
var savedExport = SavedExports.SaveExport(export, Database, CurrentUser);
return RedirectToAction(MVC.Config.Export.Create(savedExport.Id));