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

fix issue #3514 - custom theme as default

stable
Juanfran 2015-11-26 08:34:57 +01:00
parent 86a2d713b5
commit 4ca9730562
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -44,9 +44,9 @@ class AuthService extends taiga.Service
@themeService) -> @themeService) ->
super() super()
@._currentTheme = @config.get("defaultTheme") || "taiga" # load on index.jade
userModel = @.getUser() userModel = @.getUser()
@._currentTheme = @._getUserTheme()
@.setUserdata(userModel) @.setUserdata(userModel)
setUserdata: (userModel) -> setUserdata: (userModel) ->
@ -57,7 +57,7 @@ class AuthService extends taiga.Service
@.userData = null @.userData = null
_getUserTheme: -> _getUserTheme: ->
return @rootscope.user?.theme || @config.get("defaultTheme") || "taiga" return @rootscope.user?.theme || @config.get("defaultTheme") || "taiga" # load on index.jade
_setTheme: -> _setTheme: ->
newTheme = @._getUserTheme() newTheme = @._getUserTheme()
@ -84,6 +84,8 @@ class AuthService extends taiga.Service
@._setTheme() @._setTheme()
return user return user
else
@._setTheme()
return null return null