Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
Submit
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Iterations
Wiki
Requirements
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Locked files
Deploy
Releases
Package registry
Container registry
Model registry
Operate
Terraform modules
Analyze
Contributor analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
GitLab community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
EIP
Labrador
Submit
Commits
07d7971b
Commit
07d7971b
authored
Feb 16, 2021
by
Otto Visser
Browse files
Options
Downloads
Plain Diff
Merge branch '76-role-translation-errors-on-archived-editions' into 'development'
Resolve "Role translation errors on archived editions" Closes
#76
See merge request
!78
parents
bd296712
4bb80f25
Branches
Branches containing commit
Tags
Tags containing commit
2 merge requests
!81
Minor fixes
,
!78
Resolve "Role translation errors on archived editions"
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
src/main/resources/messages.properties
+1
-0
1 addition, 0 deletions
src/main/resources/messages.properties
src/main/resources/templates/edition/enrolled.html
+1
-1
1 addition, 1 deletion
src/main/resources/templates/edition/enrolled.html
with
2 additions
and
1 deletion
src/main/resources/messages.properties
+
1
−
0
View file @
07d7971b
...
...
@@ -77,6 +77,7 @@ edition.email.enter = Enter course email
edition.contact_policy
=
Contact policy
edition.contact_policy.enter
=
Enter contact policy
edition.archive
=
Archive edition
edition.archived
=
Archived
edition.archive.confirm
=
Are you sure you want to archive {0}?
edition.student_overview
=
Student overview
edition.student_overview.back
=
Back to full overview
...
...
This diff is collapsed.
Click to expand it.
src/main/resources/templates/edition/enrolled.html
+
1
−
1
View file @
07d7971b
...
...
@@ -52,7 +52,7 @@
<span
class=
"edition_course"
th:text=
"${courses[role.edition.id]}"
></span>
</div>
<span
class=
"edition_role"
th:text=
"#{|role.${#strings.toLowerCase(role.type.toString())}|}"
></span>
<span
class=
"edition_role"
th:text=
"
${role.edition.isArchived} ? #{edition.archived} :
#{|role.${#strings.toLowerCase(role.type.toString())}|}"
></span>
</a>
<button
th:if=
"${@authorizationService.isManagerOfAny()}"
onclick=
"toggleOverlay('add-overlay')"
class=
"interactive card edition_new"
>
<span
class=
"card_icon fas fa-plus-circle"
></span>
...
...
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
sign in
to comment