aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndré Noack <noack@data-quest.de>2024-02-02 13:02:48 +0000
committerJan-Hendrik Willms <tleilax+github@gmail.com>2024-02-09 12:19:34 +0100
commit66a01d55e48592fbacf0f81d37cc7765a2c133ef (patch)
tree436fa059e920e40ba07d595a374edf95622c3bd4
parentdf960491ad31e37100873df6592562e90a98e4c4 (diff)
Resolve #3566 "Ankündigung bearbeiten: Der Bearbeiter wird immer als Ersteller eingetragen"
Closes #3566 Merge request studip/studip!2451
-rw-r--r--app/controllers/news.php12
1 files changed, 10 insertions, 2 deletions
diff --git a/app/controllers/news.php b/app/controllers/news.php
index 4793312..1e18889 100644
--- a/app/controllers/news.php
+++ b/app/controllers/news.php
@@ -293,6 +293,7 @@ class NewsController extends StudipController
$news->date = $news_template->date;
$news->expire = $news_template->expire;
$news->allow_comments = $news_template->allow_comments;
+ $news->user_id = User::findCurrent()->id;
} else {
// for new news, set startdate to today and range to dialog context
$news->date = strtotime('today');
@@ -359,6 +360,12 @@ class NewsController extends StudipController
'type' => 'checkbox'
],
'user_id' => [
+ 'type' => 'hidden',
+ 'mapper' => function () use ($news) {
+ return $news->user_id ?: User::findCurrent()->id;
+ }
+ ],
+ 'chdate_uid' => [
'type' => 'no',
'mapper' => function () {
return User::findCurrent()->id;
@@ -366,8 +373,9 @@ class NewsController extends StudipController
],
'author' => [
'type' => 'no',
- 'mapper' => function () {
- return get_fullname();
+ 'mapper' => function () use ($news) {
+ $author = $news->user_id ? User::find($news->user_id): User::findCurrent();
+ return $author ? $author->getFullname() : '';
}
]
]