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-08-25 17:46:48 +00:00
parent ec6077edf0
commit cfbb70c284
4 changed files with 17 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
devdocs/deploy.txt
View File

@@ -240,3 +240,10 @@ IMPORTANT NOTES:
DOCKER / LINUX CHEAT SHEET DOCKER / LINUX CHEAT SHEET
Alpine linux enter container and run shell from docker: Alpine linux enter container and run shell from docker:
docker run -it [container_id] /bin/ash docker run -it [container_id] /bin/ash
<!-- <Target Name="CopyCustomContent" AfterTargets="AfterBuild">
<Copy SourceFiles=".\resource\ay-report.js;" DestinationFolder="$(OutDir)\resource\rpt" />
<!-- <Copy SourceFiles=".\resource\rpt\ay-report.js;.\resource\rpt\ay-hb.js;.\resource\rpt\ay-md.js" DestinationFolder="$(OutDir)\resource\rpt" /> -->
</Target> -->

10
server/AyaNova/AyaNova.csproj
View File

@@ -45,8 +45,14 @@
</ItemGroup> </ItemGroup>
<Target Name="CopyCustomContent" AfterTargets="AfterBuild"> <Target Name="CopyCustomContent" AfterTargets="AfterBuild">
<Copy SourceFiles=".\resource\de.json;.\resource\reportjs\ay-report.js;.\resource\en.json;.\resource\es.json;.\resource\fr.json" DestinationFolder="$(OutDir)\resource" /> <Copy SourceFiles=".\resource\de.json;.\resource\en.json;.\resource\es.json;.\resource\fr.json" DestinationFolder="$(OutDir)\resource" />
<Copy SourceFiles=".\resource\reportjs\ay-report.js;.\resource\reportjs\ay-hb.js;.\resource\reportjs\ay-md.js" DestinationFolder="$(OutDir)\resource\reportjs" /> <!-- <Copy SourceFiles=".\resource\rpt\ay-report.js;.\resource\rpt\ay-hb.js;.\resource\rpt\ay-md.js" DestinationFolder="$(OutDir)\resource\rpt" /> -->
</Target> </Target>
<ItemGroup>
<Content Include=".\resource\rpt\*.*">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</Content>
</ItemGroup>
</Project> </Project>

2
server/AyaNova/Controllers/ReportController.cs
View File

@@ -87,7 +87,7 @@ namespace AyaNova.Api.Controllers
//var localIpAddress = httpConnectionFeature?.LocalIpAddress; //var localIpAddress = httpConnectionFeature?.LocalIpAddress;
//todo: validate files are present somehow? //todo: validate files are present somehow?
var ReportJSFolderPath = Path.Combine(ServerBootConfig.AYANOVA_CONTENT_ROOT_PATH, "resource", "reportjs"); var ReportJSFolderPath = Path.Combine(ServerBootConfig.AYANOVA_CONTENT_ROOT_PATH, "resource", "rpt");
if (!Directory.Exists(ReportJSFolderPath)) if (!Directory.Exists(ReportJSFolderPath))
throw new System.Exception($"E1012: \"reportjs\" folder not found where expected: \"{ReportJSFolderPath}\", installation damaged?"); throw new System.Exception($"E1012: \"reportjs\" folder not found where expected: \"{ReportJSFolderPath}\", installation damaged?");

1
server/AyaNova/resource/en.json
View File

@@ -1921,4 +1921,5 @@
"ShutDownServer": "Shut down server", "ShutDownServer": "Shut down server",
"AreYouSureShutDown": "Are you certain you want to shut down the server?", "AreYouSureShutDown": "Are you certain you want to shut down the server?",
"ViewServerConfiguration": "View server configuration" "ViewServerConfiguration": "View server configuration"
} }