diff --git a/app/assets/javascripts/app/controllers/_dashboard/activity_stream.js.coffee b/app/assets/javascripts/app/controllers/_dashboard/activity_stream.js.coffee index 2fa6576c8..8c6aafb9e 100644 --- a/app/assets/javascripts/app/controllers/_dashboard/activity_stream.js.coffee +++ b/app/assets/javascripts/app/controllers/_dashboard/activity_stream.js.coffee @@ -54,7 +54,7 @@ class App.DashboardActivityStream extends App.Controller item.title = object.displayName() item.object_name = object.objectDisplayName() - item.created_by = App.User.find( item.created_by_id ) + item.created_by = App.User.retrieve( item.created_by_id ) html = App.view('dashboard/activity_stream')( head: 'Activity Stream', diff --git a/app/assets/javascripts/app/controllers/_default_navbar.js.coffee b/app/assets/javascripts/app/controllers/_default_navbar.js.coffee index 1f0d1d39d..72391f094 100644 --- a/app/assets/javascripts/app/controllers/_default_navbar.js.coffee +++ b/app/assets/javascripts/app/controllers/_default_navbar.js.coffee @@ -4,6 +4,7 @@ App.Config.set( 'User', { callback: -> item = {} item['name'] = App.Session.get( 'login' ) + item['image'] = App.Session.get( 'image' ) return item target: '#current_user', class: 'user' diff --git a/app/assets/javascripts/app/views/dashboard/activity_stream.jst.eco b/app/assets/javascripts/app/views/dashboard/activity_stream.jst.eco index 4683ac703..56283d4c6 100644 --- a/app/assets/javascripts/app/views/dashboard/activity_stream.jst.eco +++ b/app/assets/javascripts/app/views/dashboard/activity_stream.jst.eco @@ -1,7 +1,7 @@