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

qol: wait for attachment thumbnail generation and show additional file type-specific icons

Browse Source
This commit is contained in:
Gary Sharp
2024-12-18 19:37:15 +11:00
parent 9f10eeeb70
commit 7550e0e45d
24 changed files with 226 additions and 116 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Disco.Web/Extensions/T4MVC/API.DeviceController.generated.cs
+5 -5
View File
@@ -480,7 +480,7 @@ namespace Disco.Web.Areas.API.Controllers
public class ActionParamsClass_AttachmentUpload
{
public readonly string id = "id";
public readonly string Comments = "Comments";
public readonly string comments = "comments";
}
static readonly ActionParamsClass_Attachment s_params_Attachment = new ActionParamsClass_Attachment();
[GeneratedCode("T4MVC", "2.0"), DebuggerNonUserCode]
@@ -812,15 +812,15 @@ namespace Disco.Web.Areas.API.Controllers
}
[NonAction]
partial void AttachmentUploadOverride(T4MVC_System_Web_Mvc_ActionResult callInfo, string id, string Comments);
partial void AttachmentUploadOverride(T4MVC_System_Web_Mvc_ActionResult callInfo, string id, string comments);
[NonAction]
public override System.Web.Mvc.ActionResult AttachmentUpload(string id, string Comments)
public override System.Web.Mvc.ActionResult AttachmentUpload(string id, string comments)
{
var callInfo = new T4MVC_System_Web_Mvc_ActionResult(Area, Name, ActionNames.AttachmentUpload);
ModelUnbinderHelpers.AddRouteValues(callInfo.RouteValueDictionary, "id", id);
ModelUnbinderHelpers.AddRouteValues(callInfo.RouteValueDictionary, "Comments", Comments);
AttachmentUploadOverride(callInfo, id, Comments);
ModelUnbinderHelpers.AddRouteValues(callInfo.RouteValueDictionary, "comments", comments);
AttachmentUploadOverride(callInfo, id, comments);
return callInfo;
}
Disco.Web/Extensions/T4MVC/API.JobController.generated.cs
+10 -10
View File
@@ -1175,7 +1175,7 @@ namespace Disco.Web.Areas.API.Controllers
public class ActionParamsClass_AttachmentUpload
{
public readonly string id = "id";
public readonly string Comments = "Comments";
public readonly string comments = "comments";
}
static readonly ActionParamsClass_Attachment s_params_Attachment = new ActionParamsClass_Attachment();
[GeneratedCode("T4MVC", "2.0"), DebuggerNonUserCode]
@@ -1253,7 +1253,7 @@ namespace Disco.Web.Areas.API.Controllers
[GeneratedCode("T4MVC", "2.0"), DebuggerNonUserCode]
public class ActionParamsClass_Export
{
public readonly string Model = "Model";
public readonly string model = "model";
}
static readonly ActionParamsClass_ExportRetrieve s_params_ExportRetrieve = new ActionParamsClass_ExportRetrieve();
[GeneratedCode("T4MVC", "2.0"), DebuggerNonUserCode]
@@ -2052,15 +2052,15 @@ namespace Disco.Web.Areas.API.Controllers
}
[NonAction]
partial void AttachmentUploadOverride(T4MVC_System_Web_Mvc_ActionResult callInfo, int id, string Comments);
partial void AttachmentUploadOverride(T4MVC_System_Web_Mvc_ActionResult callInfo, int id, string comments);
[NonAction]
public override System.Web.Mvc.ActionResult AttachmentUpload(int id, string Comments)
public override System.Web.Mvc.ActionResult AttachmentUpload(int id, string comments)
{
var callInfo = new T4MVC_System_Web_Mvc_ActionResult(Area, Name, ActionNames.AttachmentUpload);
ModelUnbinderHelpers.AddRouteValues(callInfo.RouteValueDictionary, "id", id);
ModelUnbinderHelpers.AddRouteValues(callInfo.RouteValueDictionary, "Comments", Comments);
AttachmentUploadOverride(callInfo, id, Comments);
ModelUnbinderHelpers.AddRouteValues(callInfo.RouteValueDictionary, "comments", comments);
AttachmentUploadOverride(callInfo, id, comments);
return callInfo;
}
@@ -2189,14 +2189,14 @@ namespace Disco.Web.Areas.API.Controllers
}
[NonAction]
partial void ExportOverride(T4MVC_System_Web_Mvc_ActionResult callInfo, Disco.Web.Models.Job.ExportModel Model);
partial void ExportOverride(T4MVC_System_Web_Mvc_ActionResult callInfo, Disco.Web.Models.Job.ExportModel model);
[NonAction]
public override System.Web.Mvc.ActionResult Export(Disco.Web.Models.Job.ExportModel Model)
public override System.Web.Mvc.ActionResult Export(Disco.Web.Models.Job.ExportModel model)
{
var callInfo = new T4MVC_System_Web_Mvc_ActionResult(Area, Name, ActionNames.Export);
ModelUnbinderHelpers.AddRouteValues(callInfo.RouteValueDictionary, "Model", Model);
ExportOverride(callInfo, Model);
ModelUnbinderHelpers.AddRouteValues(callInfo.RouteValueDictionary, "model", model);
ExportOverride(callInfo, model);
return callInfo;
}
Disco.Web/Extensions/T4MVC/API.SystemController.generated.cs
+5 -5
View File
@@ -260,7 +260,7 @@ namespace Disco.Web.Areas.API.Controllers
[GeneratedCode("T4MVC", "2.0"), DebuggerNonUserCode]
public class ActionParamsClass_DeleteOrganisationAddress
{
public readonly string Id = "Id";
public readonly string id = "id";
public readonly string redirect = "redirect";
}
static readonly ActionParamsClass_UpdateMultiSiteMode s_params_UpdateMultiSiteMode = new ActionParamsClass_UpdateMultiSiteMode();
@@ -498,15 +498,15 @@ namespace Disco.Web.Areas.API.Controllers
}
[NonAction]
partial void DeleteOrganisationAddressOverride(T4MVC_System_Web_Mvc_ActionResult callInfo, int Id, bool redirect);
partial void DeleteOrganisationAddressOverride(T4MVC_System_Web_Mvc_ActionResult callInfo, int id, bool redirect);
[NonAction]
public override System.Web.Mvc.ActionResult DeleteOrganisationAddress(int Id, bool redirect)
public override System.Web.Mvc.ActionResult DeleteOrganisationAddress(int id, bool redirect)
{
var callInfo = new T4MVC_System_Web_Mvc_ActionResult(Area, Name, ActionNames.DeleteOrganisationAddress);
ModelUnbinderHelpers.AddRouteValues(callInfo.RouteValueDictionary, "Id", Id);
ModelUnbinderHelpers.AddRouteValues(callInfo.RouteValueDictionary, "id", id);
ModelUnbinderHelpers.AddRouteValues(callInfo.RouteValueDictionary, "redirect", redirect);
DeleteOrganisationAddressOverride(callInfo, Id, redirect);
DeleteOrganisationAddressOverride(callInfo, id, redirect);
return callInfo;
}
Disco.Web/Extensions/T4MVC/API.UserController.generated.cs
+5 -5
View File
@@ -179,7 +179,7 @@ namespace Disco.Web.Areas.API.Controllers
{
public readonly string id = "id";
public readonly string Domain = "Domain";
public readonly string Comments = "Comments";
public readonly string comments = "comments";
}
static readonly ActionParamsClass_Attachment s_params_Attachment = new ActionParamsClass_Attachment();
[GeneratedCode("T4MVC", "2.0"), DebuggerNonUserCode]
@@ -278,16 +278,16 @@ namespace Disco.Web.Areas.API.Controllers
}
[NonAction]
partial void AttachmentUploadOverride(T4MVC_System_Web_Mvc_ActionResult callInfo, string id, string Domain, string Comments);
partial void AttachmentUploadOverride(T4MVC_System_Web_Mvc_ActionResult callInfo, string id, string Domain, string comments);
[NonAction]
public override System.Web.Mvc.ActionResult AttachmentUpload(string id, string Domain, string Comments)
public override System.Web.Mvc.ActionResult AttachmentUpload(string id, string Domain, string comments)
{
var callInfo = new T4MVC_System_Web_Mvc_ActionResult(Area, Name, ActionNames.AttachmentUpload);
ModelUnbinderHelpers.AddRouteValues(callInfo.RouteValueDictionary, "id", id);
ModelUnbinderHelpers.AddRouteValues(callInfo.RouteValueDictionary, "Domain", Domain);
ModelUnbinderHelpers.AddRouteValues(callInfo.RouteValueDictionary, "Comments", Comments);
AttachmentUploadOverride(callInfo, id, Domain, Comments);
ModelUnbinderHelpers.AddRouteValues(callInfo.RouteValueDictionary, "comments", comments);
AttachmentUploadOverride(callInfo, id, Domain, comments);
return callInfo;
}
Disco.Web/Extensions/T4MVC/T4MVC.cs
+6
View File
@@ -648,11 +648,17 @@ namespace Links
public const string UrlPath = "~/ClientSource/Style/Images/AttachmentTypes";
public static string Url() { return T4MVCHelpers.ProcessVirtualPath(UrlPath); }
public static string Url(string fileName) { return T4MVCHelpers.ProcessVirtualPath(UrlPath + "/" + fileName); }
public static readonly string archive_png = Url("archive.png");
public static readonly string audio_png = Url("audio.png");
public static readonly string binary_png = Url("binary.png");
public static readonly string document_png = Url("document.png");
public static readonly string expressionBrowserIcons_png = Url("expressionBrowserIcons.png");
public static readonly string image_png = Url("image.png");
public static readonly string pdf_png = Url("pdf.png");
public static readonly string spreadsheet_png = Url("spreadsheet.png");
public static readonly string txt_png = Url("txt.png");
public static readonly string unknown_png = Url("unknown.png");
public static readonly string video_png = Url("video.png");
}
public static readonly string BackgroundDocument_png = Url("BackgroundDocument.png");