From 34677d5b5c7dbefe791fcb98f9fe9e30c08c9040 Mon Sep 17 00:00:00 2001 From: DrosoCode Date: Mon, 31 May 2021 13:56:58 +0200 Subject: [PATCH] feat: onlyoffice url config in settings --- cmd/config_init.go | 1 + cmd/config_set.go | 2 ++ frontend/src/utils/constants.js | 2 ++ frontend/src/views/Files.vue | 3 ++- frontend/src/views/files/OnlyOfficeEditor.vue | 4 ++-- frontend/src/views/settings/Global.vue | 14 ++++++++++++++ http/settings.go | 3 +++ http/static.go | 1 + settings/settings.go | 1 + 9 files changed, 28 insertions(+), 3 deletions(-) diff --git a/cmd/config_init.go b/cmd/config_init.go index 12b11688..1dc0fd52 100644 --- a/cmd/config_init.go +++ b/cmd/config_init.go @@ -39,6 +39,7 @@ override the options.`, DisableExternal: mustGetBool(flags, "branding.disableExternal"), Files: mustGetString(flags, "branding.files"), }, + OnlyOffice: "", } ser := &settings.Server{ diff --git a/cmd/config_set.go b/cmd/config_set.go index 058f0d6b..d5485017 100644 --- a/cmd/config_set.go +++ b/cmd/config_set.go @@ -57,6 +57,8 @@ you want to change. Other options will remain unchanged.`, set.Branding.DisableExternal = mustGetBool(flags, flag.Name) case "branding.files": set.Branding.Files = mustGetString(flags, flag.Name) + case "onlyoffice": + set.OnlyOffice = mustGetString(flags, flag.Name) } }) diff --git a/frontend/src/utils/constants.js b/frontend/src/utils/constants.js index 200c4e8d..442787b8 100644 --- a/frontend/src/utils/constants.js +++ b/frontend/src/utils/constants.js @@ -15,6 +15,7 @@ const enableThumbs = window.FileBrowser.EnableThumbs; const resizePreview = window.FileBrowser.ResizePreview; const enableExec = window.FileBrowser.EnableExec; const origin = window.location.origin; +const onlyOffice = window.FileBrowser.OnlyOffice; export { name, @@ -33,4 +34,5 @@ export { resizePreview, enableExec, origin, + onlyOffice, }; diff --git a/frontend/src/views/Files.vue b/frontend/src/views/Files.vue index 36be5e52..dc4b017f 100644 --- a/frontend/src/views/Files.vue +++ b/frontend/src/views/Files.vue @@ -22,6 +22,7 @@