Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
AoU-Backend
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Package registry
Container registry
Model registry
Operate
Environments
Terraform modules
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
AoU
AoU-Backend
Merge requests
!938
fix: [AOU-1989] include comments in notification emails for updated deposits
Code
Review changes
Check out branch
Download
Patches
Plain diff
Merged
fix: [AOU-1989] include comments in notification emails for updated deposits
adf-1989-comments-in-notification
into
master
Overview
0
Commits
1
Pipelines
0
Changes
1
Merged
Alicia.DeDiosFuente
requested to merge
adf-1989-comments-in-notification
into
master
6 months ago
Overview
0
Commits
1
Pipelines
0
Changes
1
Expand
https://issues.unige.ch/browse/AOU-1989
0
0
Merge request reports
Compare
master
version 2
31223b6a
6 months ago
version 1
e77e80f3
6 months ago
master (base)
and
latest version
latest version
92777c1b
1 commit,
6 months ago
version 2
31223b6a
1 commit,
6 months ago
version 1
e77e80f3
1 commit,
6 months ago
1 file
+
28
−
12
Inline
Compare changes
Side-by-side
Inline
Show whitespace changes
Show one file at a time
AoU-Admin/src/main/resources/email-templates/new_deposits_to_validate.html
+
28
−
12
Options
@@ -8,19 +8,35 @@
<p>
Bonjour,
</p>
<p>
De nouveaux dépôts sont en attente de validation.
</p>
<p>
Dépôts modifiés à revalider :
</p>
<ul
th:each=
"publication : ${publications}"
>
<li
th:if=
"${publication.getStatus() == T(ch.unige.aou.model.publication.Publication$PublicationStatus).UPDATES_VALIDATION}"
>
<a
th:href=
"${homePage} + '/deposit-to-validate/detail/' + ${publication.resId}"
th:utext=
"${publication.title}"
></a>
<span
th:text=
"' - Déposé par ' + ${publication.creator.getFullName()}"
></span>
</li>
</ul>
<div
th:each=
"publication : ${publications}"
>
<div
style=
"border:solid 1px #888;padding:5px;margin: 5px 0px;"
th:if=
"${publication.getStatus() == T(ch.unige.aou.model.publication.Publication$PublicationStatus).UPDATES_VALIDATION}"
>
<p>
<a
th:href=
"${homePage} + '/deposit-to-validate/detail/' + ${publication.resId}"
th:utext=
"${publication.title}"
></a>
</p>
<div
th:if=
"${publication.getLastComment(false) != null}"
>
<h4
style=
"display:inline;"
>
Dernier commentaire :
</h4>
<pre
style=
"font-style:italic;display:inline;"
th:text=
"'“' + ${publication.getLastComment(false).getText()} + '”'"
></pre>
<p
style=
"display:inline;"
th:text=
"' par ' + ${publication.getLastComment(false).getPerson().getFullName()} + ' ('
+ ${#temporals.format(publication.getLastComment(false).getLastUpdate().getWhen(), 'dd.MM.yyyy HH:mm:ss', 'Europe/Zurich')} + ' )'"
></p>
</div>
</div>
</div>
<p>
Dépôts à valider :
</p>
<ul
th:each=
"publication : ${publications}"
>
<li
th:if=
"${publication.getStatus() == T(ch.unige.aou.model.publication.Publication$PublicationStatus).IN_VALIDATION}"
>
<a
th:href=
"${homePage} + '/deposit-to-validate/detail/' + ${publication.resId}"
th:utext=
"${publication.title}"
></a>
<span
th:text=
"' - Déposé par ' + ${publication.creator.getFullName()}"
></span>
</li>
</ul>
<div
th:each=
"publication : ${publications}"
>
<div
style=
"border:solid 1px #888;padding:5px;margin: 5px 0px;"
th:if=
"${publication.getStatus() == T(ch.unige.aou.model.publication.Publication$PublicationStatus).IN_VALIDATION}"
>
<p>
<a
th:href=
"${homePage} + '/deposit-to-validate/detail/' + ${publication.resId}"
th:utext=
"${publication.title}"
></a>
</p>
<div
th:if=
"${publication.getLastComment(false) != null}"
>
<h4
style=
"display:inline;"
>
Dernier commentaire :
</h4>
<pre
style=
"font-style:italic;display:inline;"
th:text=
"'“' + ${publication.getLastComment(false).getText()} + '”'"
></pre>
<p
style=
"display:inline;"
th:text=
"' par ' + ${publication.getLastComment(false).getPerson().getFullName()} + ' ('
+ ${#temporals.format(publication.getLastComment(false).getLastUpdate().getWhen(), 'dd.MM.yyyy HH:mm:ss', 'Europe/Zurich')} + ' )'"
></p>
</div>
</div>
</div>
<p><em>
Archive ouverte UNIGE
</em></p>
<p>
--------
<br/>
Loading