Fixed not shown activity stream.
This commit is contained in:
parent
525edc4ab4
commit
bf08039a1c
3 changed files with 5 additions and 8 deletions
|
@ -41,12 +41,10 @@ class App.DashboardActivityStream extends App.Controller
|
||||||
render: (items) ->
|
render: (items) ->
|
||||||
|
|
||||||
# show description of activity stream
|
# show description of activity stream
|
||||||
if _.isEmpty(items)
|
return if _.isEmpty(items)
|
||||||
@$('.activity-description').removeClass('hidden')
|
|
||||||
return
|
|
||||||
|
|
||||||
# remove description of activity stream
|
# remove description of activity stream
|
||||||
@$('.activity-description').remove()
|
@$('.activity-description').removeClass('activity-description')
|
||||||
|
|
||||||
items = @prepareForObjectList(items)
|
items = @prepareForObjectList(items)
|
||||||
|
|
||||||
|
@ -54,8 +52,7 @@ class App.DashboardActivityStream extends App.Controller
|
||||||
for item in items
|
for item in items
|
||||||
html.append(@renderItem(item))
|
html.append(@renderItem(item))
|
||||||
|
|
||||||
@$('.activity-entries').remove()
|
@el.html html
|
||||||
@el.append html
|
|
||||||
|
|
||||||
renderItem: (item) ->
|
renderItem: (item) ->
|
||||||
html = $(App.view('dashboard/activity_stream')(
|
html = $(App.view('dashboard/activity_stream')(
|
||||||
|
|
|
@ -33,7 +33,7 @@ class App.Dashboard extends App.Controller
|
||||||
)
|
)
|
||||||
|
|
||||||
new App.DashboardActivityStream(
|
new App.DashboardActivityStream(
|
||||||
el: localEl.find('.sidebar')
|
el: localEl.find('.js-activityContent')
|
||||||
limit: 25
|
limit: 25
|
||||||
)
|
)
|
||||||
|
|
||||||
|
|
|
@ -8,7 +8,7 @@
|
||||||
</div>
|
</div>
|
||||||
<div class="sidebar optional">
|
<div class="sidebar optional">
|
||||||
<h2><%- @T('Activity Stream') %></h2>
|
<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('Here you will find latest activities in your system.') %></p>
|
||||||
<p><%- @T('E. g. recent changed tickets, users or organizations.') %></p>
|
<p><%- @T('E. g. recent changed tickets, users or organizations.') %></p>
|
||||||
</div>
|
</div>
|
||||||
|
|
Loading…
Reference in a new issue