From a021097b06a76172547af5df9a34a823cd4deab8 Mon Sep 17 00:00:00 2001 From: Liang Ding Date: Fri, 10 Mar 2023 09:47:34 +0800 Subject: [PATCH] =?UTF-8?q?:art:=20=E6=94=B9=E8=BF=9B=E5=86=85=E6=A0=B8?= =?UTF-8?q?=E5=8F=AA=E8=AF=BB=E6=A8=A1=E5=BC=8F=20https://github.com/siyua?= =?UTF-8?q?n-note/siyuan/issues/7615?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- kernel/api/notebook.go | 18 ++++++++++++++++++ kernel/api/router.go | 4 ++-- 2 files changed, 20 insertions(+), 2 deletions(-) diff --git a/kernel/api/notebook.go b/kernel/api/notebook.go index ddbea5059..1f6aa153b 100644 --- a/kernel/api/notebook.go +++ b/kernel/api/notebook.go @@ -102,6 +102,15 @@ func removeNotebook(c *gin.Context) { return } + if util.ReadOnly && !model.IsUserGuide(notebook) { + result := util.NewResult() + result.Code = -1 + result.Msg = model.Conf.Language(34) + result.Data = map[string]interface{}{"closeTimeout": 5000} + c.JSON(200, result) + return + } + err := model.RemoveBox(notebook) if nil != err { ret.Code = -1 @@ -167,6 +176,15 @@ func openNotebook(c *gin.Context) { return } + if util.ReadOnly && !model.IsUserGuide(notebook) { + result := util.NewResult() + result.Code = -1 + result.Msg = model.Conf.Language(34) + result.Data = map[string]interface{}{"closeTimeout": 5000} + c.JSON(200, result) + return + } + msgId := util.PushMsg(model.Conf.Language(45), 1000*60*15) defer util.PushClearMsg(msgId) existed, err := model.Mount(notebook) diff --git a/kernel/api/router.go b/kernel/api/router.go index 220d20ab2..902d24f7b 100644 --- a/kernel/api/router.go +++ b/kernel/api/router.go @@ -73,12 +73,12 @@ func ServeAPI(ginServer *gin.Engine) { ginServer.Handle("POST", "/api/account/startFreeTrial", model.CheckAuth, model.CheckReadonly, startFreeTrial) ginServer.Handle("POST", "/api/notebook/lsNotebooks", model.CheckAuth, lsNotebooks) - ginServer.Handle("POST", "/api/notebook/openNotebook", model.CheckAuth, model.CheckReadonly, openNotebook) + ginServer.Handle("POST", "/api/notebook/openNotebook", model.CheckAuth, openNotebook) ginServer.Handle("POST", "/api/notebook/closeNotebook", model.CheckAuth, model.CheckReadonly, closeNotebook) ginServer.Handle("POST", "/api/notebook/getNotebookConf", model.CheckAuth, getNotebookConf) ginServer.Handle("POST", "/api/notebook/setNotebookConf", model.CheckAuth, model.CheckReadonly, setNotebookConf) ginServer.Handle("POST", "/api/notebook/createNotebook", model.CheckAuth, model.CheckReadonly, createNotebook) - ginServer.Handle("POST", "/api/notebook/removeNotebook", model.CheckAuth, model.CheckReadonly, removeNotebook) + ginServer.Handle("POST", "/api/notebook/removeNotebook", model.CheckAuth, removeNotebook) ginServer.Handle("POST", "/api/notebook/renameNotebook", model.CheckAuth, model.CheckReadonly, renameNotebook) ginServer.Handle("POST", "/api/notebook/changeSortNotebook", model.CheckAuth, model.CheckReadonly, changeSortNotebook) ginServer.Handle("POST", "/api/notebook/setNotebookIcon", model.CheckAuth, model.CheckReadonly, setNotebookIcon)