taiga
/
taiga-front
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

fix taiga-theme load twice

stable
Juanfran 2015-09-08 13:05:13 +02:00
parent f12e664eec
commit 8acc9d1d36
1 changed files with 13 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
app/coffee/modules/auth.coffee
View File

@ -43,6 +43,9 @@ class AuthService extends taiga.Service
constructor: (@rootscope, @storage, @model, @rs, @http, @urls, @config, @translate, @currentUserService, constructor: (@rootscope, @storage, @model, @rs, @http, @urls, @config, @translate, @currentUserService,
@themeService) -> @themeService) ->
super() super()
@._currentTheme = @config.get("defaultTheme") || "taiga" # load on index.jade
userModel = @.getUser() userModel = @.getUser()
@.setUserdata(userModel) @.setUserdata(userModel)
@ -53,9 +56,15 @@ class AuthService extends taiga.Service
else else
@.userData = null @.userData = null
_getUserTheme: ->
return @rootscope.user?.theme || @config.get("defaultTheme") || "taiga"
_setTheme: -> _setTheme: ->
theme = @rootscope.user?.theme || @config.get("defaultTheme") || "taiga" newTheme = @._getUserTheme()
@themeService.use(theme)
if @._currentTheme != newTheme
@._currentTheme = newTheme
@themeService.use(@._currentTheme)
_setLocales: -> _setLocales: ->
lang = @rootscope.user?.lang || @config.get("defaultLanguage") || "en" lang = @rootscope.user?.lang || @config.get("defaultLanguage") || "en"
@ -71,7 +80,9 @@ class AuthService extends taiga.Service
user = @model.make_model("users", userData) user = @model.make_model("users", userData)
@rootscope.user = user @rootscope.user = user
@._setLocales() @._setLocales()
@._setTheme() @._setTheme()
return user return user
return null return null