From bf08039a1cf00807a60678037bc1303938008818 Mon Sep 17 00:00:00 2001
From: Martin Edenhofer <me@edenhofer.de>
Date: Thu, 11 Feb 2016 08:36:14 +0100
Subject: [PATCH] Fixed not shown activity stream.

---
 .../app/controllers/_dashboard/activity_stream.coffee    | 9 +++------
 app/assets/javascripts/app/controllers/dashboard.coffee  | 2 +-
 app/assets/javascripts/app/views/dashboard.jst.eco       | 2 +-
 3 files changed, 5 insertions(+), 8 deletions(-)

diff --git a/app/assets/javascripts/app/controllers/_dashboard/activity_stream.coffee b/app/assets/javascripts/app/controllers/_dashboard/activity_stream.coffee
index 59a0be89d..b39cff8a6 100644
--- a/app/assets/javascripts/app/controllers/_dashboard/activity_stream.coffee
+++ b/app/assets/javascripts/app/controllers/_dashboard/activity_stream.coffee
@@ -41,12 +41,10 @@ class App.DashboardActivityStream extends App.Controller
   render: (items) ->
 
     # show description of activity stream
-    if _.isEmpty(items)
-      @$('.activity-description').removeClass('hidden')
-      return
+    return if _.isEmpty(items)
 
     # remove description of activity stream
-    @$('.activity-description').remove()
+    @$('.activity-description').removeClass('activity-description')
 
     items = @prepareForObjectList(items)
 
@@ -54,8 +52,7 @@ class App.DashboardActivityStream extends App.Controller
     for item in items
       html.append(@renderItem(item))
 
-    @$('.activity-entries').remove()
-    @el.append html
+    @el.html html
 
   renderItem: (item) ->
     html = $(App.view('dashboard/activity_stream')(
diff --git a/app/assets/javascripts/app/controllers/dashboard.coffee b/app/assets/javascripts/app/controllers/dashboard.coffee
index bae51c7a3..35d54c302 100644
--- a/app/assets/javascripts/app/controllers/dashboard.coffee
+++ b/app/assets/javascripts/app/controllers/dashboard.coffee
@@ -33,7 +33,7 @@ class App.Dashboard extends App.Controller
     )
 
     new App.DashboardActivityStream(
-      el:    localEl.find('.sidebar')
+      el:    localEl.find('.js-activityContent')
       limit: 25
     )
 
diff --git a/app/assets/javascripts/app/views/dashboard.jst.eco b/app/assets/javascripts/app/views/dashboard.jst.eco
index 4020add13..334065998 100644
--- a/app/assets/javascripts/app/views/dashboard.jst.eco
+++ b/app/assets/javascripts/app/views/dashboard.jst.eco
@@ -8,7 +8,7 @@
 </div>
 <div class="sidebar optional">
   <h2><%- @T('Activity Stream') %></h2>
-  <div class="activity-description hidden">
+  <div class="activity-description js-activityContent">
     <p><%- @T('Here you will find latest activities in your system.') %></p>
     <p><%- @T('E. g. recent changed tickets, users or organizations.') %></p>
   </div>