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

Merge remote-tracking branch 'remotes/origin/release/1.8.0' into develop

Browse Source 
# Conflicts:
#	web/documentserver-example/php/assets/js/jscript.js
This commit is contained in:
Sergey Linnik
2024-03-05 16:33:14 +03:00
parent d8251f3280 0c8110d2aa
commit 5f3eaa05f9
3 changed files with 15 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
web/documentserver-example/csharp-mvc/Models/FileUtility.cs
View File

@ -23,6 +23,7 @@ using System.IO;
using static OnlineEditorsExampleMVC.Models.FileUtility; using static OnlineEditorsExampleMVC.Models.FileUtility;
using System.Linq; using System.Linq;
using System.Text; using System.Text;
using Newtonsoft.Json.Converters;
namespace OnlineEditorsExampleMVC.Models namespace OnlineEditorsExampleMVC.Models
{ {
@ -48,9 +49,21 @@ namespace OnlineEditorsExampleMVC.Models
} }
} }
public class EmptyTolerantStringEnumConverter : StringEnumConverter
{
public override object ReadJson(JsonReader reader, Type objectType, object existingValue, JsonSerializer serializer)
{
if (reader.TokenType == JsonToken.String && string.IsNullOrWhiteSpace(reader.Value.ToString()))
return Activator.CreateInstance(objectType);
return base.ReadJson(reader, objectType, existingValue, serializer);
}
}
public class Format public class Format
{ {
public string Name { get; } public string Name { get; }
[JsonConverter(typeof(EmptyTolerantStringEnumConverter))]
public FileType Type { get; } public FileType Type { get; }
public List<string> Actions { get; } public List<string> Actions { get; }
public List<string> Convert { get; } public List<string> Convert { get; }

2
web/documentserver-example/php/assets/js/jscript.js
View File

@ -199,7 +199,7 @@ if (typeof jQuery != "undefined") {
jq("#beginView, #beginEmbedded").removeClass("disable"); jq("#beginView, #beginEmbedded").removeClass("disable");
var fileName = jq("#hiddenFileName").val(); var fileName = jq("#hiddenFileName").val();
var posExt = fileName.lastIndexOf('.'); var posExt = fileName.lastIndexOf('.') + 1;
posExt = 0 <= posExt ? fileName.substring(posExt + 1).trim().toLowerCase() : ''; posExt = 0 <= posExt ? fileName.substring(posExt + 1).trim().toLowerCase() : '';
if (EditedExtList.indexOf(posExt) != -1 || FillFormsExtList.indexOf(posExt) != -1) { if (EditedExtList.indexOf(posExt) != -1 || FillFormsExtList.indexOf(posExt) != -1) {

2
web/documentserver-example/php/src/views/DocEditorView.php
View File

@ -48,7 +48,7 @@ final class DocEditorView extends View
$jwtManager = new JwtManager(); $jwtManager = new JwtManager();
$userList = new ExampleUsers(); $userList = new ExampleUsers();
$fileId = $request["fileID"] ?? ""; $fileId = $request["fileID"] ?? "";
$user = $userList->getUser($request["user"]); $user = $userList->getUser($request["user"] ?? null);
$isEnableDirectUrl = isset($request["directUrl"]) ? filter_var($request["directUrl"], FILTER_VALIDATE_BOOLEAN) $isEnableDirectUrl = isset($request["directUrl"]) ? filter_var($request["directUrl"], FILTER_VALIDATE_BOOLEAN)
: false; : false;
if (!empty($externalUrl)) { if (!empty($externalUrl)) {