0ct0pu5/siyuan
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

🐛 The authentication page after startup Alt+M fails https://github.com/siyuan-note/siyuan/issues/9575

Browse source
This commit is contained in:
Daniel 2023-11-09 09:55:11 +08:00
parent f67061d6cf
commit 1556d6d6a9
No known key found for this signature in database
GPG key ID: 86211BA83DF03017
1 changed files with 20 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
kernel/server/serve.go
View file

@ -317,6 +317,25 @@ func serveCheckAuth(c *gin.Context) {
return
}
keymapHideWindow := "⌥M"
if nil != (*model.Conf.Keymap)["general"] {
switch (*model.Conf.Keymap)["general"].(type) {
case map[string]interface{}:
keymapGeneral := (*model.Conf.Keymap)["general"].(map[string]interface{})
if nil != keymapGeneral["toggleWin"] {
switch keymapGeneral["toggleWin"].(type) {
case map[string]interface{}:
toggleWin := keymapGeneral["toggleWin"].(map[string]interface{})
if nil != toggleWin["custom"] {
keymapHideWindow = toggleWin["custom"].(string)
}
}
}
}
if "" == keymapHideWindow {
keymapHideWindow = "⌥M"
}
}
model := map[string]interface{}{
"l0": model.Conf.Language(173),
"l1": model.Conf.Language(174),
@ -330,6 +349,7 @@ func serveCheckAuth(c *gin.Context) {
"appearanceModeOS": model.Conf.Appearance.ModeOS,
"workspace": filepath.Base(util.WorkspaceDir),
"workspacePath": util.WorkspaceDir,
"keymapHideWindow": keymapHideWindow,
}
buf := &bytes.Buffer{}
if err = tpl.Execute(buf, model); nil != err {