admin/raven
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Browse Source
This commit is contained in:
John Cardinal
2020-10-23 23:13:00 +00:00
parent d8dceb9183
commit dbbe8c7e08
1 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
server/AyaNova/Controllers/ExportController.cs
View File

@@ -82,10 +82,12 @@ namespace AyaNova.Api.Controllers
log.LogDebug($"Fetching data for {dataListSelection.SelectedRowIds.Length} {dataListSelection.ObjectType} items"); log.LogDebug($"Fetching data for {dataListSelection.SelectedRowIds.Length} {dataListSelection.ObjectType} items");
var TheData = await ((IExportAbleObject)biz).GetExportData(dataListSelection.SelectedRowIds); var TheData = await ((IExportAbleObject)biz).GetExportData(dataListSelection.SelectedRowIds);
string outputRandomFileNameNoExtension = StringUtil.ReplaceLastOccurrence(FileUtil.NewRandomFileName, ".", ""); string baseFileName = FileUtil.StringToSafeFileName($"{dataListSelection.ObjectType.ToString().ToLowerInvariant()}-{FileUtil.GetSafeDateFileName()}");
string outputSourceFileName = outputRandomFileNameNoExtension + "." + format;
// string outputRandomFileNameNoExtension = StringUtil.ReplaceLastOccurrence(FileUtil.NewRandomFileName, ".", "");
string outputSourceFileName = baseFileName + "." + format;
string outputSourceFullPath = System.IO.Path.Combine(FileUtil.TemporaryFilesFolder, outputSourceFileName); string outputSourceFullPath = System.IO.Path.Combine(FileUtil.TemporaryFilesFolder, outputSourceFileName);
string outputZipFullpath = System.IO.Path.Combine(FileUtil.TemporaryFilesFolder, outputRandomFileNameNoExtension + ".zip"); string outputZipFullpath = System.IO.Path.Combine(FileUtil.TemporaryFilesFolder, baseFileName + ".zip");
// string outputFullPathSourceFile=outputFullPathNoExtension // string outputFullPathSourceFile=outputFullPathNoExtension
// string outputFullpathZipFile=outputFullPathNoExtension + ".zip"; // string outputFullpathZipFile=outputFullPathNoExtension + ".zip";
log.LogDebug($"Calling render export data to file"); log.LogDebug($"Calling render export data to file");
@@ -111,7 +113,7 @@ namespace AyaNova.Api.Controllers
} }
log.LogDebug($"Completed, returning results"); log.LogDebug($"Completed, returning results");
return Ok(ApiOkResponse.Response(outputRandomFileNameNoExtension + ".zip")); return Ok(ApiOkResponse.Response(baseFileName + ".zip"));
} }