Merge branch 'develop' of github.com:martini/zammad into develop
This commit is contained in:
commit
d65fcc87fe
2 changed files with 5 additions and 8 deletions
|
@ -75,15 +75,12 @@ class App.OnlineNotificationWidget extends App.Controller
|
|||
App.i18n.translateInline( 'Notifications' ) + " <span>#{counter}</span>"
|
||||
content: =>
|
||||
# insert data
|
||||
html = $( App.view('widget/online_notification')(
|
||||
items: items
|
||||
))
|
||||
html.on('click', (e) =>
|
||||
e.preventDefault()
|
||||
@markAllAsSeen(items)
|
||||
)
|
||||
$( App.view('widget/online_notification')(items: items))
|
||||
).on('shown.bs.popover', =>
|
||||
# show frontend times
|
||||
$('#markAllAsSeen').bind('click', (e) =>
|
||||
@markAllAsSeen(items)
|
||||
);
|
||||
@frontendTimeUpdate()
|
||||
)
|
||||
|
||||
|
|
|
@ -1,5 +1,5 @@
|
|||
<% if @items.length: %>
|
||||
<a href="#"><%- @T( 'Mark all as seen.' ) %></a>
|
||||
<a href="#" id="markAllAsSeen"><%- @T( 'Mark all as seen.' ) %></a>
|
||||
<% for item in @items: %>
|
||||
<div class="activity-entry horizontal">
|
||||
<a class="activity-avatar user-popover" data-id="<%= item.created_by_id %>" href="<%- item.created_by.uiUrl() %>">
|
||||
|
|
Loading…
Reference in a new issue