From 280a209008b3d3960cdd4f9e06aa07aa9bf05dbf Mon Sep 17 00:00:00 2001 From: Alejandro Alonso Date: Tue, 12 May 2015 15:25:05 +0200 Subject: [PATCH] Refreshing avatar image --- app/coffee/modules/auth.coffee | 6 ++++++ .../dropdown-user/dropdown-user.directive.coffee | 3 ++- app/modules/navigation-bar/dropdown-user/dropdown-user.jade | 4 ++-- 3 files changed, 10 insertions(+), 3 deletions(-) diff --git a/app/coffee/modules/auth.coffee b/app/coffee/modules/auth.coffee index 7735eb04..4e9e884b 100644 --- a/app/coffee/modules/auth.coffee +++ b/app/coffee/modules/auth.coffee @@ -40,6 +40,11 @@ class AuthService extends taiga.Service constructor: (@rootscope, @storage, @model, @rs, @http, @urls, @config, @translate) -> super() + userModel = @.getUser() + @.setUserdata(userModel) + + setUserdata: (userModel) -> + @.userData = Immutable.fromJS(userModel.getAttrs()) _setLocales: -> lang = @rootscope.user.lang || @config.get("defaultLanguage") || "en" @@ -62,6 +67,7 @@ class AuthService extends taiga.Service @rootscope.auth = user @storage.set("userInfo", user.getAttrs()) @rootscope.user = user + @.setUserdata(user) @._setLocales() diff --git a/app/modules/navigation-bar/dropdown-user/dropdown-user.directive.coffee b/app/modules/navigation-bar/dropdown-user/dropdown-user.directive.coffee index 18f46138..82da69f9 100644 --- a/app/modules/navigation-bar/dropdown-user/dropdown-user.directive.coffee +++ b/app/modules/navigation-bar/dropdown-user/dropdown-user.directive.coffee @@ -3,8 +3,9 @@ DropdownUserDirective = (authService, configService, locationService, link = (scope, el, attrs, ctrl) -> scope.vm = {} - scope.vm.user = authService.getUser() + #scope.vm.user = authService.user scope.vm.isFeedbackEnabled = configService.get("feedbackEnabled") + taiga.defineImmutableProperty(scope.vm, "user", () -> authService.userData) scope.vm.logout = -> authService.logout() diff --git a/app/modules/navigation-bar/dropdown-user/dropdown-user.jade b/app/modules/navigation-bar/dropdown-user/dropdown-user.jade index 6f718291..2eab692b 100644 --- a/app/modules/navigation-bar/dropdown-user/dropdown-user.jade +++ b/app/modules/navigation-bar/dropdown-user/dropdown-user.jade @@ -1,5 +1,5 @@ -a.user-avatar(tg-nav="profile", title="{{ vm.user.full_name_display }}") {{ vm.user.full_name_display }} - img(tg-bo-src="vm.user.photo", alt="{{ 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(ng-src="{{ vm.user.get('photo') }}", alt="{{ vm.user.get('full_name_display') }}") div.navbar-dropdown.dropdown-user ul