xuemingqiang/leanote
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

admin username & jsonp fixed

Browse Source
This commit is contained in:
life
2014-10-23 10:45:03 +08:00
parent 536c5de56a
commit b0b304d5dd
4 changed files with 21 additions and 20 deletions

4
app/controllers/BlogController.go

@ -161,7 +161,7 @@ func (c Blog) Cate(notebookId string) revel.Result {
}
// 显示分类的最近博客, json
func (c Blog) ListCateLatest(notebookId string) revel.Result {
func (c Blog) ListCateLatest(notebookId, callback string) revel.Result {
if notebookId == "" {
return c.E404()
}
@ -192,7 +192,7 @@ func (c Blog) ListCateLatest(notebookId string) revel.Result {
re := info.NewRe()
re.Ok = true
re.List = blogs
return c.RenderJson(re)
return c.RenderJsonP(callback, re)
}
func (c Blog) Index(userIdOrEmail string) revel.Result {

3
app/controllers/NoteController.go

@ -53,8 +53,7 @@ func (c Note) Index() revel.Result {
// 当然, 还需要得到第一个notes的content
//...
adminUsername, _ := revel.Config.String("adminUsername")
c.RenderArgs["isAdmin"] = adminUsername == userInfo.Username
c.RenderArgs["isAdmin"] = leanoteUserId == userInfo.Username
c.RenderArgs["userInfo"] = userInfo
c.RenderArgs["userInfoJson"] = c.Json(userInfo)
c.RenderArgs["notebooks"] = c.Json(notebooks)

3
app/controllers/admin/init.go

@ -129,7 +129,4 @@ func init() {
revel.InterceptFunc(AuthInterceptor, revel.BEFORE, &AdminEmail{})
revel.InterceptFunc(AuthInterceptor, revel.BEFORE, &AdminUpgrade{})
revel.InterceptFunc(AuthInterceptor, revel.BEFORE, &AdminData{})
revel.OnAppStart(func() {
adminUsername, _ = revel.Config.String("adminUsername")
})
}