Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

bring back the settings ui #4691

Merged
merged 1 commit into from
Sep 27, 2022
Merged

bring back the settings ui #4691

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions changelog/unreleased/fix-bring-back-settings-ui.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
Bugfix: Bring back the settings UI in Web

We've fixed the oC Web configuration in oCIS so that the settings UI will be shown again in Web.

https://github.com/owncloud/ocis/pull/4691
4 changes: 4 additions & 0 deletions services/web/pkg/config/defaults/defaultconfig.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,6 +49,10 @@ func DefaultConfig() *config.Config {
},
Apps: []string{"files", "search", "text-editor", "pdf-viewer", "external", "user-management"},
ExternalApps: []config.ExternalApp{
{
ID: "settings",
Path: "/settings.js",
},
{
ID: "preview",
Path: "web-app-preview",
Expand Down
9 changes: 0 additions & 9 deletions services/web/pkg/service/v0/service.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -73,15 +73,6 @@ func (p Web) getPayload() (payload []byte, err error) {
p.config.Web.Config.Theme = p.config.Web.ThemePath
}

if p.config.Web.Config.ExternalApps == nil {
p.config.Web.Config.ExternalApps = []config.ExternalApp{
{
ID: "settings",
Path: "/settings.js",
},
}
}

// make apps render as empty array if it is empty
// TODO remove once https://github.com/golang/go/issues/27589 is fixed
if len(p.config.Web.Config.Apps) == 0 {
Expand Down