fix displaying message in case creator and updater are present

hpi-schul-cloud · Feb 6, 2024 · d0c46d8 · d0c46d8
1 parent 020f733
commit d0c46d8
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 2 deletions.
diff --git a/controllers/news.js b/controllers/news.js
@@ -124,9 +124,11 @@ router.get('/:newsId', (req, res, next) => {
 	api(req, { version: VERSION })
 		.get(`/news/${req.params.newsId}`)
 		.then((news) => {
+			const creatorAndUpdaterPresent = !!(news.updater && news.creator);
 			res.render('news/article', {
 				title: news.title,
 				news,
+				creatorAndUpdaterPresent,
 				isRSS: news.source === 'rss',
 			});
 		})

diff --git a/views/news/article.hbs b/views/news/article.hbs
@@ -4,10 +4,12 @@
     {{#unless isRSS}}
     <small class="text-muted">
         {{#if news.updater}}
-        {{$t "news.text.last" }} {{$t "news.text.processed" }} {{$t "news.text.by" }} {{news.updater.firstName}} {{news.updater.lastName}} |
+        {{$t "news.text.last" }} {{$t "news.text.processed" }} {{$t "news.text.by" }} {{news.updater.firstName}} {{news.updater.lastName}}
         {{/if}}
+        {{#if creatorAndUpdaterPresent}} | {{/if}}
+        {{$t "news.text.created" }}
         {{#if news.creator}}
-        {{$t "news.text.created" }} {{$t "news.text.by" }} {{news.creator.firstName}} {{news.creator.lastName}}
+        {{$t "news.text.by" }} {{news.creator.firstName}} {{news.creator.lastName}}
         {{/if}}
         {{timeFromNow news.displayAt}}
         {{#if news.target.name}}