Andreas/wekan
1
0
Fork 0
mirror of https://github.com/wekan/wekan.git synced 2025-12-16 23:40:13 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 5

notifications are now displayed correctly again

Browse source
This commit is contained in:
Martin Filser 2023-11-07 19:05:11 +01:00
parent 4e25e335a9
commit 402528d97e
2 changed files with 4 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

2
client/components/notifications/notificationsDrawer.jade
View file

@ -11,7 +11,7 @@ template(name='notificationsDrawer')
a.fa.fa-times-thin.close a.fa.fa-times-thin.close
ul.notifications ul.notifications
each transformedProfile.notifications each transformedProfile.notifications
+notification(activityData=activity index=dbIndex read=read) +notification(activityData=activityObj index=dbIndex read=read)
if($gt unreadNotifications 0) if($gt unreadNotifications 0)
a.all-read {{_ 'mark-all-as-read'}} a.all-read {{_ 'mark-all-as-read'}}
if ($and ($.Session.get 'showReadNotifications') ($gt readNotifications 0)) if ($and ($.Session.get 'showReadNotifications') ($gt readNotifications 0))

4
models/users.js
View file

@ -852,7 +852,9 @@ Users.helpers({
const notification = notifications[index]; const notification = notifications[index];
// this preserves their db sort order for editing // this preserves their db sort order for editing
notification.dbIndex = index; notification.dbIndex = index;
notification.activity = ReactiveCache.getActivity(notification.activity); if (!notification.activityObj && typeof(notification.activity) === 'string') {
notification.activityObj = ReactiveCache.getActivity(notification.activity);
}
} }
// this sorts them newest to oldest to match Trello's behavior // this sorts them newest to oldest to match Trello's behavior
notifications.reverse(); notifications.reverse();