sascha
/
nextcloud-server
mirror of https://github.com/nextcloud/server.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Set the link of the notification on render instead of creation 

Signed-off-by: Joas Schilling <coding@schilljs.com>
pull/2982/head
Joas Schilling 2017-01-09 11:18:59 +07:00
parent e675c2a66c
commit acbf0d151f
No known key found for this signature in database
GPG Key ID: E166FD8976B3BAC8
2 changed files with 8 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
apps/updatenotification/lib/Notification/BackgroundJob.php
Unescape Escape View File

@ -54,7 +54,7 @@ class BackgroundJob extends TimedJob {
/** @var IURLGenerator */
protected $urlGenerator;
/** @var IUser[] */
/** @var string[] */
protected $users;
/**
@ -97,8 +97,7 @@ class BackgroundJob extends TimedJob {
$status = $updater->check();
if (isset($status['version'])) {
$url = $this->urlGenerator->linkToRouteAbsolute('settings.AdminSettings.index') . '#updater';
$this->createNotifications('core', $status['version'], $url, $status['versionstring']);
$this->createNotifications('core', $status['version'], $status['versionstring']);
}
}
@ -110,8 +109,7 @@ class BackgroundJob extends TimedJob {
foreach ($apps as $app) {
$update = $this->isUpdateAvailable($app);
if ($update !== false) {
$url = $this->urlGenerator->linkToRouteAbsolute('settings.AppSettings.viewApps') . '#app-' . $app;
$this->createNotifications($app, $update, $url);
$this->createNotifications($app, $update);
}
}
}
@ -121,10 +119,9 @@ class BackgroundJob extends TimedJob {
*
* @param string $app
* @param string $version
* @param string $url
* @param string $visibleVersion
*/
protected function createNotifications($app, $version, $url, $visibleVersion = '') {
protected function createNotifications($app, $version, $visibleVersion = '') {
$lastNotification = $this->config->getAppValue('updatenotification', $app, false);
if ($lastNotification === $version) {
// We already notified about this update
@ -138,8 +135,7 @@ class BackgroundJob extends TimedJob {
$notification = $this->notificationManager->createNotification();
$notification->setApp('updatenotification')
->setDateTime(new \DateTime())
->setObject($app, $version)
->setLink($url);
->setObject($app, $version);
if ($visibleVersion !== '') {
$notification->setSubject('update_available', ['version' => $visibleVersion]);

3
apps/updatenotification/lib/Notification/Notifier.php
Unescape Escape View File

@ -76,6 +76,7 @@ class Notifier implements INotifier {
$parameters = $notification->getSubjectParameters();
$notification->setParsedSubject($l->t('Update to %1$s is available.', [$parameters['version']]));
$notification->setLink($this->url->linkToRouteAbsolute('settings.AdminSettings.index') . '#updater');
} else {
$appInfo = $this->getAppInfo($notification->getObjectType());
$appName = ($appInfo === null) ? $notification->getObjectType() : $appInfo['name'];
@ -92,6 +93,8 @@ class Notifier implements INotifier {
'name' => $appName,
]
]);
$notification->setLink($this->url->linkToRouteAbsolute('settings.AppSettings.viewApps') . '#app-' . $notification->getObjectType());
}
$notification->setIcon($this->url->getAbsoluteURL($this->url->imagePath('updatenotification', 'notification.svg')));