Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions Intersect.Editor/Forms/FrmUploadToServer.Designer.cs

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,6 @@ IOptionsMonitor<UpdateServerOptions> updateServerOptionsMonitor
/// Files are saved to the assets/client directory and will be automatically
/// included in the next client update manifest.
/// </summary>
/// <param name="files">Files to upload</param>
/// <param name="subfolder">Optional subfolder within assets/client (e.g., "resources", "resources/images")</param>
/// <returns>Upload results for each file</returns>
[HttpPost("client")]
Expand All @@ -60,19 +59,17 @@ IOptionsMonitor<UpdateServerOptions> updateServerOptionsMonitor
[ProducesResponseType(typeof(ErrorResponse), (int)HttpStatusCode.BadRequest, ContentTypes.Json)]
[ProducesResponseType(typeof(ErrorResponse), (int)HttpStatusCode.Forbidden, ContentTypes.Json)]
public async Task<IActionResult> UploadClientFiles(
[FromForm] IFormFileCollection files,
[FromForm] string? subfolder = null
)
{
return await UploadFilesInternal("client", files, subfolder);
return await UploadFilesInternal("client", Request.Form.Files, subfolder);
}

/// <summary>
/// Upload editor update files from the editor.
/// Files are saved to the assets/editor directory and will be automatically
/// included in the next editor update manifest.
/// </summary>
/// <param name="files">Files to upload</param>
/// <param name="subfolder">Optional subfolder within assets/editor</param>
/// <returns>Upload results for each file</returns>
[HttpPost("editor")]
Expand All @@ -81,11 +78,10 @@ public async Task<IActionResult> UploadClientFiles(
[ProducesResponseType(typeof(ErrorResponse), (int)HttpStatusCode.BadRequest, ContentTypes.Json)]
[ProducesResponseType(typeof(ErrorResponse), (int)HttpStatusCode.Forbidden, ContentTypes.Json)]
public async Task<IActionResult> UploadEditorFiles(
[FromForm] IFormFileCollection files,
[FromForm] string? subfolder = null
)
{
return await UploadFilesInternal("editor", files, subfolder);
return await UploadFilesInternal("editor", Request.Form.Files, subfolder);
}

private async Task<IActionResult> UploadFilesInternal(
Expand Down
Loading