v1.0 fixed

This commit is contained in:
life
2014-10-23 10:03:19 +08:00
parent 0ea4843cac
commit 1f51f6cc9b
12 changed files with 76 additions and 70 deletions

View File

@ -20,7 +20,7 @@ func (c Auth) Login(email, from string) revel.Result {
c.RenderArgs["subTitle"] = c.Message("login")
c.RenderArgs["email"] = email
c.RenderArgs["from"] = from
c.RenderArgs["openRegister"] = openRegister
c.RenderArgs["openRegister"] = configService.IsOpenRegister()
sessionId := c.Session.Id()
if sessionService.LoginTimesIsOver(sessionId) {
@ -92,7 +92,7 @@ func (c Auth) Demo() revel.Result {
//--------
// 注册
func (c Auth) Register(from string) revel.Result {
if !openRegister {
if !configService.IsOpenRegister() {
return c.Redirect("/index")
}
c.SetLocale()
@ -103,7 +103,7 @@ func (c Auth) Register(from string) revel.Result {
return c.RenderTemplate("home/register.html")
}
func (c Auth) DoRegister(email, pwd string) revel.Result {
if !openRegister {
if !configService.IsOpenRegister() {
return c.Redirect("/index")
}

View File

@ -16,7 +16,7 @@ type Index struct {
func (c Index) Index() revel.Result {
c.SetUserInfo()
c.RenderArgs["title"] = "leanote"
c.RenderArgs["openRegister"] = openRegister
c.RenderArgs["openRegister"] = configService.GlobalStringConfigs["openRegister"]
lang := c.SetLocale()
return c.RenderTemplate("home/index_" + lang + ".html");

View File

@ -33,7 +33,7 @@ func (c Note) Index() revel.Result {
return c.Redirect("/login")
}
c.RenderArgs["openRegister"] = openRegister
c.RenderArgs["openRegister"] = configService.IsOpenRegister()
// 已登录了, 那么得到所有信息
notebooks := notebookService.GetNotebooks(userId)

View File

@ -104,6 +104,12 @@ func (c AdminSetting) DoSubDomain(noteSubDomain, blogSubDomain, leaSubDomain, bl
return c.RenderJson(re)
}
func (c AdminSetting) OpenRegister(openRegister string) revel.Result {
re := info.NewRe()
re.Ok = configService.UpdateGlobalStringConfig(c.GetUserId(), "openRegister", openRegister)
return c.RenderJson(re)
}
func (c AdminSetting) Mongodb(mongodumpPath, mongorestorePath string) revel.Result {
re := info.NewRe()
re.Ok = configService.UpdateGlobalStringConfig(c.GetUserId(), "mongodumpPath", mongodumpPath)

View File

@ -30,9 +30,8 @@ var sessionService *service.SessionService
var pageSize = 1000
var defaultSortField = "UpdatedTime"
var leanoteUserId = "52d26b4e99c37b609a000001"
var leanoteUserId = "admin" // 不能更改
var siteUrl = "http://leanote.com"
var openRegister = true
// 拦截器
// 不需要拦截的url
@ -142,8 +141,6 @@ func init() {
revel.InterceptFunc(AuthInterceptor, revel.BEFORE, &NoteContentHistory{})
revel.OnAppStart(func() {
leanoteUserId, _ = revel.Config.String("adminUsername")
siteUrl, _ = revel.Config.String("site.url")
openRegister, _ = revel.Config.Bool("register.open")
})
}