Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Communication: Fix an issue that stops channels from loading messages #9745

Merged
merged 2 commits into from
Nov 16, 2024
Merged

Communication: Fix an issue that stops channels from loading messages #9745

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
585b9ed
Bugfix
PaRangger Nov 11, 2024
6011c04
Merge branch 'develop' into bugfix/communication/fix-crashing-module-…
PaRangger Nov 15, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions src/main/webapp/app/shared/metis/posting-header/posting-header.directive.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -95,6 +95,10 @@ export abstract class PostingHeaderDirective<T extends Posting> implements OnIni
this.userAuthority = 'tutor';
this.userRoleBadge = roleBadgeTranslationPath + this.userAuthority;
this.userAuthorityTooltip = toolTipTranslationPath + this.userAuthority;
} else {
this.userAuthority = 'student';
this.userRoleBadge = 'artemisApp.metis.userRoles.deleted';
this.userAuthorityTooltip = 'artemisApp.metis.userAuthorityTooltips.deleted';
PaRangger marked this conversation as resolved.
Show resolved Hide resolved
}
}
}
6 changes: 4 additions & 2 deletions src/main/webapp/i18n/de/metis.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -142,12 +142,14 @@
"userRoles": {
"instructor": "Instruktor",
"tutor": "Tutor",
"student": "Student"
"student": "Student",
"deleted": "Gelöscht"
},
"userAuthorityTooltips": {
"instructor": "Lehrkraft: Verantwortlich für die Kursdurchführung.",
"tutor": "Tutor:in: Verantwortlich für die Unterstützung der Studierenden bei ihren Fragen zum Kurs und zu den Übungen.",
"student": "Studierende:r: Nimmt an Kursen und Übungen teil und stellt Fragen."
"student": "Studierende:r: Nimmt an Kursen und Übungen teil und stellt Fragen.",
"deleted": "Gelöscht: Nutzer:in wurde gelöscht."
}
}
}
Expand Down
6 changes: 4 additions & 2 deletions src/main/webapp/i18n/en/metis.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -142,12 +142,14 @@
"userRoles": {
"instructor": "Instructor",
"tutor": "Tutor",
"student": "Student"
"student": "Student",
"deleted": "Deleted"
},
"userAuthorityTooltips": {
"instructor": "Instructor: Responsible for course conduction.",
"tutor": "Tutor: Responsible for helping users with their questions about the course and exercises.",
"student": "Student: Takes courses, participates in exercises, and asks questions."
"student": "Student: Takes courses, participates in exercises, and asks questions.",
"deleted": "Deleted: This user was deleted."
}
}
}
Expand Down
Loading