diff --git a/Intersect.Editor/Forms/FrmUploadToServer.Designer.cs b/Intersect.Editor/Forms/FrmUploadToServer.Designer.cs index 367109e457..0a915d9f0d 100644 --- a/Intersect.Editor/Forms/FrmUploadToServer.Designer.cs +++ b/Intersect.Editor/Forms/FrmUploadToServer.Designer.cs @@ -172,7 +172,7 @@ private void InitializeComponent() // // btnLogin // - this.btnLogin.Location = new System.Drawing.Point(206, 270); + this.btnLogin.Location = new System.Drawing.Point(206, 290); this.btnLogin.Name = "btnLogin"; this.btnLogin.Padding = new System.Windows.Forms.Padding(5); this.btnLogin.Size = new System.Drawing.Size(85, 28); @@ -184,7 +184,7 @@ private void InitializeComponent() // btnUpload // this.btnUpload.Enabled = false; - this.btnUpload.Location = new System.Drawing.Point(297, 270); + this.btnUpload.Location = new System.Drawing.Point(297, 290); this.btnUpload.Name = "btnUpload"; this.btnUpload.Padding = new System.Windows.Forms.Padding(5); this.btnUpload.Size = new System.Drawing.Size(85, 28); @@ -195,7 +195,7 @@ private void InitializeComponent() // btnClose // this.btnClose.DialogResult = System.Windows.Forms.DialogResult.Cancel; - this.btnClose.Location = new System.Drawing.Point(388, 270); + this.btnClose.Location = new System.Drawing.Point(388, 290); this.btnClose.Name = "btnClose"; this.btnClose.Padding = new System.Windows.Forms.Padding(5); this.btnClose.Size = new System.Drawing.Size(84, 28); @@ -207,7 +207,7 @@ private void InitializeComponent() // this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; - this.ClientSize = new System.Drawing.Size(484, 320); + this.ClientSize = new System.Drawing.Size(484, 350); this.Controls.Add(this.btnTestUrl); this.Controls.Add(this.btnLogin); this.Controls.Add(this.btnClose); diff --git a/Intersect.Server/Web/Controllers/Api/EditorUpdatesController.cs b/Intersect.Server/Web/Controllers/Api/EditorUpdatesController.cs index b6f06a7d08..56721fdb39 100644 --- a/Intersect.Server/Web/Controllers/Api/EditorUpdatesController.cs +++ b/Intersect.Server/Web/Controllers/Api/EditorUpdatesController.cs @@ -51,7 +51,6 @@ IOptionsMonitor updateServerOptionsMonitor /// Files are saved to the assets/client directory and will be automatically /// included in the next client update manifest. /// - /// Files to upload /// Optional subfolder within assets/client (e.g., "resources", "resources/images") /// Upload results for each file [HttpPost("client")] @@ -60,11 +59,10 @@ IOptionsMonitor updateServerOptionsMonitor [ProducesResponseType(typeof(ErrorResponse), (int)HttpStatusCode.BadRequest, ContentTypes.Json)] [ProducesResponseType(typeof(ErrorResponse), (int)HttpStatusCode.Forbidden, ContentTypes.Json)] public async Task UploadClientFiles( - [FromForm] IFormFileCollection files, [FromForm] string? subfolder = null ) { - return await UploadFilesInternal("client", files, subfolder); + return await UploadFilesInternal("client", Request.Form.Files, subfolder); } /// @@ -72,7 +70,6 @@ public async Task UploadClientFiles( /// Files are saved to the assets/editor directory and will be automatically /// included in the next editor update manifest. /// - /// Files to upload /// Optional subfolder within assets/editor /// Upload results for each file [HttpPost("editor")] @@ -81,11 +78,10 @@ public async Task UploadClientFiles( [ProducesResponseType(typeof(ErrorResponse), (int)HttpStatusCode.BadRequest, ContentTypes.Json)] [ProducesResponseType(typeof(ErrorResponse), (int)HttpStatusCode.Forbidden, ContentTypes.Json)] public async Task 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 UploadFilesInternal(