diff --git a/Oqtane.Client/Modules/Controls/FileManager.razor b/Oqtane.Client/Modules/Controls/FileManager.razor index 5a344a18..97363437 100644 --- a/Oqtane.Client/Modules/Controls/FileManager.razor +++ b/Oqtane.Client/Modules/Controls/FileManager.razor @@ -55,7 +55,7 @@
- @if (ShowFiles && GetFileId() != -1) + @if (GetFileId() != -1) { } @@ -63,7 +63,7 @@
-
+
} @@ -382,38 +382,41 @@ } StateHasChanged(); } - } - catch (Exception ex) - { - await logger.LogError(ex, "File Upload Failed {Error}", ex.Message); - _message = Localizer["Error.File.Upload"]; - _messagetype = MessageType.Error; - } - } - else - { - _message = string.Format(Localizer["Message.File.Restricted"], restricted); - _messagetype = MessageType.Warning; - } - } - else - { - _message = Localizer["Message.File.NotSelected"]; - _messagetype = MessageType.Warning; - } - } + } + catch (Exception ex) + { + await logger.LogError(ex, "File Upload Failed {Error}", ex.Message); + _message = Localizer["Error.File.Upload"]; + _messagetype = MessageType.Error; + } + } + else + { + _message = string.Format(Localizer["Message.File.Restricted"], restricted); + _messagetype = MessageType.Warning; + } + } + else + { + _message = Localizer["Message.File.NotSelected"]; + _messagetype = MessageType.Warning; + } + } - private async Task DeleteFile() - { - _message = string.Empty; - try - { - await FileService.DeleteFileAsync(FileId); - await logger.LogInformation("File Deleted {File}", FileId); - await OnDelete.InvokeAsync(FileId); + private async Task DeleteFile() + { + _message = string.Empty; + try + { + await FileService.DeleteFileAsync(FileId); + await logger.LogInformation("File Deleted {File}", FileId); + await OnDelete.InvokeAsync(FileId); - _message = Localizer["Success.File.Delete"]; - _messagetype = MessageType.Success; + if (ShowSuccess) + { + _message = Localizer["Success.File.Delete"]; + _messagetype = MessageType.Success; + } await GetFiles(); FileId = -1; diff --git a/Oqtane.Server/wwwroot/js/interop.js b/Oqtane.Server/wwwroot/js/interop.js index 8b98c530..5ee359c8 100644 --- a/Oqtane.Server/wwwroot/js/interop.js +++ b/Oqtane.Server/wwwroot/js/interop.js @@ -291,7 +291,7 @@ Oqtane.Interop = { var progressbar = document.getElementById('ProgressBar_' + id); progressinfo.setAttribute("style", "display: inline;"); - progressbar.setAttribute("style", "width: 200px; display: inline;"); + progressbar.setAttribute("style", "width: 100%; display: inline;"); for (var i = 0; i < files.length; i++) { var FileChunk = [];