Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
A
AlekSIS-Core
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Package Registry
Container Registry
Model registry
Operate
Terraform modules
Monitor
Service Desk
Analyze
Contributor analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Terms and privacy
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
AlekSIS®
Official
AlekSIS-Core
Commits
95971d91
Commit
95971d91
authored
1 year ago
by
Nik | Klampfradler
Browse files
Options
Downloads
Plain Diff
Merge branch '873-frontend-issues-after-update-to-aleksis-core-3-1-1' into 'master'
Resolve "Frontend issues after update to AlekSIS-Core 3.1.1" Closes
#873
See merge request
!1276
parents
27f9c2e8
28a82332
No related branches found
No related tags found
1 merge request
!1276
Resolve "Frontend issues after update to AlekSIS-Core 3.1.1"
Pipeline
#134922
failed
1 year ago
Stage: prepare
Stage: test
Stage: build
Stage: publish
Stage: docker
Stage: deploy
Changes
2
Pipelines
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
CHANGELOG.rst
+5
-0
5 additions, 0 deletions
CHANGELOG.rst
aleksis/core/frontend/components/notifications/NotificationList.vue
+5
-3
5 additions, 3 deletions
...re/frontend/components/notifications/NotificationList.vue
with
10 additions
and
3 deletions
CHANGELOG.rst
+
5
−
0
View file @
95971d91
...
...
@@ -9,6 +9,11 @@ and this project adheres to `Semantic Versioning`_.
Unreleased
----------
Fixed
~~~~~
* Notifications were not properly shown in the frontend.
`3.1.1` - 2023-07-01
--------------------
...
...
This diff is collapsed.
Click to expand it.
aleksis/core/frontend/components/notifications/NotificationList.vue
+
5
−
3
View file @
95971d91
...
...
@@ -20,7 +20,7 @@
v-if=
"
myNotifications &&
myNotifications.person &&
myNotifications.person.n
otifications.length > 0
unreadN
otifications.length > 0
"
>
mdi-bell-badge-outline
...
...
@@ -38,7 +38,7 @@
v-if=
"
myNotifications.person &&
myNotifications.person.notifications &&
unreadN
otifications.length
myNotifications.person.n
otifications.length
"
>
<v-subheader>
{{
$t
(
"
notifications.notifications
"
)
}}
</v-subheader>
...
...
@@ -88,7 +88,9 @@ export default {
},
computed
:
{
unreadNotifications
()
{
return
this
.
myNotifications
.
filter
((
n
)
=>
!
n
.
read
);
return
this
.
myNotifications
.
person
.
notifications
?
this
.
myNotifications
.
person
.
notifications
.
filter
((
n
)
=>
!
n
.
read
)
:
[];
},
},
};
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment