Fixed not shown activity stream.

This commit is contained in:
Martin Edenhofer 2016-02-11 08:36:14 +01:00
parent 525edc4ab4
commit bf08039a1c
3 changed files with 5 additions and 8 deletions

View file

@ -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')(

View file

@ -33,7 +33,7 @@ class App.Dashboard extends App.Controller
)
new App.DashboardActivityStream(
el: localEl.find('.sidebar')
el: localEl.find('.js-activityContent')
limit: 25
)

View file

@ -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>