Browse Source

Merge branch 'fix-3315' into grampus-notebook

tags/v1.22.12.1^2
zhoupzh 3 years ago
parent
commit
66ba704e0d
4 changed files with 6 additions and 1 deletions
  1. +1
    -0
      modules/convert/cloudbrain.go
  2. +1
    -0
      modules/structs/tagger.go
  3. +1
    -1
      routers/api/v1/api.go
  4. +3
    -0
      web_src/vuepages/pages/notebook/debug/index.vue

+ 1
- 0
modules/convert/cloudbrain.go View File

@@ -104,6 +104,7 @@ func ToSpecification(s *models.Specification) *api.SpecificationShow {

func ToTagger(user *models.User) *api.Tagger {
return &api.Tagger{
ID: user.ID,
Name: user.Name,
RelAvatarURL: user.RelAvatarLink(),
Email: user.Email,


+ 1
- 0
modules/structs/tagger.go View File

@@ -1,6 +1,7 @@
package structs

type Tagger struct {
ID int64 `json:"id"`
Name string `json:"name"`
Email string `json:"email"`
RelAvatarURL string `json:"relAvatarURL"`


+ 1
- 1
routers/api/v1/api.go View File

@@ -738,7 +738,7 @@ func RegisterRoutes(m *macaron.Macaron) {
}, reqToken(), repoAssignment())

m.Group("/file_notebook", func() {
m.Get("", reqToken(), repo.GetFileNoteBookInfo)
m.Get("", repo.GetFileNoteBookInfo)
m.Post("/create", reqToken(), reqWeChat(), bind(api.CreateFileNotebookJobOption{}), repo.CreateFileNoteBook)

})


+ 3
- 0
web_src/vuepages/pages/notebook/debug/index.vue View File

@@ -342,6 +342,9 @@ export default {
}).catch((err)=>{
if(err.response.status===403 && err.response.data.code===1 ){
location.href=`${AppSubUrl}/authentication/wechat/bind`
}
if(err.response.status===401){
location.href=`${AppSubUrl}/user/login`
}
this.btnStatus[index]=0
this.alertCb = false


Loading…
Cancel
Save