Diplomarbeit-Absolventenverein/oqtane.framework
10
0
Fork 0
Code Issues Pull Requests 1 Packages Projects Releases Wiki Activity

upgrade to .NET Core 3.2 Preview 3 and fixes for issues created by #314 (#323)

Browse Source
This commit is contained in:
Shaun Walker
2020-04-02 12:07:35 -04:00
committed by GitHub
parent c2a29831c4
commit e8efc5e508
25 changed files with 164 additions and 432 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
Oqtane.Client/Modules/Controls/AuditInfo.razor
View File

@ -39,7 +39,7 @@
_text = string.Empty;
if (!String.IsNullOrEmpty(CreatedBy) || CreatedOn != null)
{
_text += "<p style=\string.Empty + Style + "\">Created ";
_text += "<p style=\"" + Style + "\">Created ";
if (!String.IsNullOrEmpty(CreatedBy))
{
@ -56,7 +56,7 @@
if (!String.IsNullOrEmpty(ModifiedBy) || ModifiedOn != null)
{
_text += "<p style=\string.Empty + Style + "\">Last modified ";
_text += "<p style=\"" + Style + "\">Last modified ";
if (!String.IsNullOrEmpty(ModifiedBy))
{
@ -73,7 +73,7 @@
if (!String.IsNullOrEmpty(DeletedBy) || DeletedOn.HasValue)
{
_text += "<p style=\string.Empty + Style + "\">Deleted ";
_text += "<p style=\"" + Style + "\">Deleted ";
if (!String.IsNullOrEmpty(DeletedBy))
{

14
Oqtane.Client/Modules/Controls/FileManager.razor
View File

@ -225,7 +225,7 @@
{
_message = string.Empty;
_fileid = int.Parse((string)e.Value);
await SetImage();
StateHasChanged();
}
@ -245,9 +245,9 @@
var ratioY = (double)maxheight / (double)file.ImageHeight;
var ratio = ratioX < ratioY ? ratioX : ratioY;
_image = "<img src=\string.Empty + ContentUrl(_fileid) + "\" alt=\string.Empty + file.Name +
"\" width=\string.Empty + Convert.ToInt32(file.ImageWidth * ratio).ToString() +
"\" height=\string.Empty + Convert.ToInt32(file.ImageHeight * ratio).ToString() + "\" />";
_image = "<img src=\"" + ContentUrl(_fileid) + "\" alt=\"" + file.Name +
"\" width=\"" + Convert.ToInt32(file.ImageWidth * ratio).ToString() +
"\" height=\"" + Convert.ToInt32(file.ImageHeight * ratio).ToString() + "\" />";
}
}
}
@ -269,13 +269,13 @@
{
result = await FileService.UploadFilesAsync(_folderid, upload, _id);
}
if (result == string.Empty)
{
await logger.LogInformation("File Upload Succeeded {Files}", upload);
_message = "<br /><div class=\"alert alert-success\" role=\"alert\">File Upload Succeeded</div>";
await GetFiles();
if (upload.Length == 1)
{
var file = _files.Where(item => item.Name == upload[0]).FirstOrDefault();
@ -308,7 +308,7 @@
private async Task DeleteFile()
{
_message = string.Empty;
try
{
await FileService.DeleteFileAsync(_fileid);

4
Oqtane.Client/Modules/Controls/Label.razor
View File

@ -31,12 +31,12 @@ else
_openLabel = "<label";
if (!string.IsNullOrEmpty(For))
{
_openLabel += " for=\string.Empty + For + "\string.Empty;
_openLabel += " for=\"" + For + "\"";
}
if (!string.IsNullOrEmpty(Class))
{
_openLabel += " class=\string.Empty + Class + "\string.Empty;
_openLabel += " class=\"" + Class + "\"";
}
_openLabel += ">";