pengjunjie/document-server-integration
1
0
Fork 1
mirror of https://github.com/ONLYOFFICE/document-server-integration.git synced 2026-04-07 14:06:11 +08:00
Code Issues Packages Projects Releases Wiki Activity

csharp-mvc: moved the submodule to the assets/document-templates subfolder

Browse Source
This commit is contained in:
ZEROM22
2023-11-09 09:56:55 +03:00
parent 34e60cd33f
commit 0057b81adc
5 changed files with 19 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
.gitmodules vendored
View File

@ -1,7 +1,3 @@
[submodule "web/documentserver-example/csharp-mvc/assets"]
path = web/documentserver-example/csharp-mvc/assets
url = https://github.com/ONLYOFFICE/document-templates
branch = main/en
[submodule "web/documentserver-example/csharp/assets"] [submodule "web/documentserver-example/csharp/assets"]
path = web/documentserver-example/csharp/assets path = web/documentserver-example/csharp/assets
url = https://github.com/ONLYOFFICE/document-templates url = https://github.com/ONLYOFFICE/document-templates
@ -54,3 +50,7 @@
path = web/documentserver-example/java-spring/src/main/resources/assets/document-formats path = web/documentserver-example/java-spring/src/main/resources/assets/document-formats
url = https://github.com/ONLYOFFICE/document-formats url = https://github.com/ONLYOFFICE/document-formats
branch = master branch = master
[submodule "web/documentserver-example/csharp-mvc/assets/document-templates"]
path = web/documentserver-example/csharp-mvc/assets/document-templates
url = https://github.com/ONLYOFFICE/document-templates
branch = main/en

2
web/documentserver-example/csharp-mvc/Helpers/DocManagerHelper.cs
View File

@ -220,7 +220,7 @@ namespace OnlineEditorsExampleMVC.Helpers
public static string CreateDemo(string fileExt, bool withContent) public static string CreateDemo(string fileExt, bool withContent)
{ {
var demoName = (withContent ? "sample." : "new.") + fileExt; // create sample or new template file with the necessary extension var demoName = (withContent ? "sample." : "new.") + fileExt; // create sample or new template file with the necessary extension
var demoPath = "assets\\" + (withContent ? "sample\\" : "new\\"); // get the path to the sample document var demoPath = "assets\\document-templates\\" + (withContent ? "sample\\" : "new\\"); // get the path to the sample document
var fileName = GetCorrectName(demoName); // get a file name with an index if the file with such a name already exists var fileName = GetCorrectName(demoName); // get a file name with an index if the file with such a name already exists

23
web/documentserver-example/csharp-mvc/OnlineEditorsExampleMVC.csproj
View File

@ -181,17 +181,18 @@
<Content Include="WebEditor.ashx" /> <Content Include="WebEditor.ashx" />
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<Content Include="assets\AUTHORS.md" /> <Content Include="assets\document-templates\AUTHORS.md" />
<Content Include="assets\LICENSE" /> <Content Include="assets\document-templates\LICENSE" />
<Content Include="assets\new\new.docx" /> <Content Include="assets\document-templates\new\new.docx" />
<Content Include="assets\new\new.docxf" /> <Content Include="assets\document-templates\new\new.docxf" />
<Content Include="assets\new\new.pptx" /> <Content Include="assets\document-templates\new\new.pptx" />
<Content Include="assets\new\new.xlsx" /> <Content Include="assets\document-templates\new\new.xlsx" />
<Content Include="assets\sample\csv.csv" /> <Content Include="assets\document-templates\README.md" />
<Content Include="assets\sample\sample.docx" /> <Content Include="assets\document-templates\sample\csv.csv" />
<Content Include="assets\sample\sample.docxf" /> <Content Include="assets\document-templates\sample\sample.docx" />
<Content Include="assets\sample\sample.pptx" /> <Content Include="assets\document-templates\sample\sample.docxf" />
<Content Include="assets\sample\sample.xlsx" /> <Content Include="assets\document-templates\sample\sample.pptx" />
<Content Include="assets\document-templates\sample\sample.xlsx" />
<None Include="packages.config" /> <None Include="packages.config" />
</ItemGroup> </ItemGroup>
<PropertyGroup> <PropertyGroup>

4
web/documentserver-example/csharp-mvc/WebEditor.ashx.cs
View File

@ -453,7 +453,7 @@ namespace OnlineEditorsExampleMVC
private static void Assets(HttpContext context) private static void Assets(HttpContext context)
{ {
var fileName = Path.GetFileName(context.Request["filename"]); var fileName = Path.GetFileName(context.Request["filename"]);
var filePath = HttpRuntime.AppDomainAppPath + "assets/sample/" + fileName; var filePath = HttpRuntime.AppDomainAppPath + "assets/document-templates/sample/" + fileName;
download(filePath, context); download(filePath, context);
} }
@ -461,7 +461,7 @@ namespace OnlineEditorsExampleMVC
private static void GetCsv(HttpContext context) private static void GetCsv(HttpContext context)
{ {
var fileName = "csv.csv"; var fileName = "csv.csv";
var filePath = HttpRuntime.AppDomainAppPath + "assets/sample/" + fileName; var filePath = HttpRuntime.AppDomainAppPath + "assets/document-templates/sample/" + fileName;
download(filePath, context); download(filePath, context);
} }

0
web/documentserver-example/csharp-mvc/assets → web/documentserver-example/csharp-mvc/assets/document-templates
View File