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

Refreshing avatar image

stable
Alejandro Alonso 2015-05-12 15:25:05 +02:00 committed by Juanfran
parent 08b731baa0
commit 280a209008
3 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -40,6 +40,11 @@ class AuthService extends taiga.Service
constructor: (@rootscope, @storage, @model, @rs, @http, @urls, @config, @translate) -> constructor: (@rootscope, @storage, @model, @rs, @http, @urls, @config, @translate) ->
super() super()
userModel = @.getUser()
@.setUserdata(userModel)
setUserdata: (userModel) ->
@.userData = Immutable.fromJS(userModel.getAttrs())
_setLocales: -> _setLocales: ->
lang = @rootscope.user.lang || @config.get("defaultLanguage") || "en" lang = @rootscope.user.lang || @config.get("defaultLanguage") || "en"
@ -62,6 +67,7 @@ class AuthService extends taiga.Service
@rootscope.auth = user @rootscope.auth = user
@storage.set("userInfo", user.getAttrs()) @storage.set("userInfo", user.getAttrs())
@rootscope.user = user @rootscope.user = user
@.setUserdata(user)
@._setLocales() @._setLocales()

3
app/modules/navigation-bar/dropdown-user/dropdown-user.directive.coffee
View File

@ -3,8 +3,9 @@ DropdownUserDirective = (authService, configService, locationService,
link = (scope, el, attrs, ctrl) -> link = (scope, el, attrs, ctrl) ->
scope.vm = {} scope.vm = {}
scope.vm.user = authService.getUser() #scope.vm.user = authService.user
scope.vm.isFeedbackEnabled = configService.get("feedbackEnabled") scope.vm.isFeedbackEnabled = configService.get("feedbackEnabled")
taiga.defineImmutableProperty(scope.vm, "user", () -> authService.userData)
scope.vm.logout = -> scope.vm.logout = ->
authService.logout() authService.logout()

4
app/modules/navigation-bar/dropdown-user/dropdown-user.jade
View File

@ -1,5 +1,5 @@
a.user-avatar(tg-nav="profile", title="{{ vm.user.full_name_display }}") {{ vm.user.full_name_display }} a.user-avatar(tg-nav="profile", title="{{ vm.user.get('full_name_display') }}") {{ vm.user.get('full_name_display') }}
img(tg-bo-src="vm.user.photo", alt="{{ vm.user.full_name_display }}") img(ng-src="{{ vm.user.get('photo') }}", alt="{{ vm.user.get('full_name_display') }}")
div.navbar-dropdown.dropdown-user div.navbar-dropdown.dropdown-user
ul ul