diff --git a/apps/updatenotification/controller/admincontroller.php b/apps/updatenotification/controller/admincontroller.php index cb0c6409d7..5dbcc68580 100644 --- a/apps/updatenotification/controller/admincontroller.php +++ b/apps/updatenotification/controller/admincontroller.php @@ -99,12 +99,13 @@ class AdminController extends Controller { if(($key = array_search($currentChannel, $channels)) !== false) { unset($channels[$key]); } - + $updateState = $this->updateChecker->getUpdateState(); $params = [ - 'isNewVersionAvailable' => ($this->updateChecker->getUpdateState() === []) ? false : true, + 'isNewVersionAvailable' => ($updateState === []) ? false : true, 'lastChecked' => $lastUpdateCheck, 'currentChannel' => $currentChannel, 'channels' => $channels, + 'newVersionString' => ($updateState === []) ? '' : $updateState['updateVersion'], ]; return new TemplateResponse($this->appName, 'admin', $params, ''); diff --git a/apps/updatenotification/tests/controller/AdminControllerTest.php b/apps/updatenotification/tests/controller/AdminControllerTest.php index 50adcd2028..d8fc2dd335 100644 --- a/apps/updatenotification/tests/controller/AdminControllerTest.php +++ b/apps/updatenotification/tests/controller/AdminControllerTest.php @@ -107,13 +107,14 @@ class AdminControllerTest extends TestCase { $this->updateChecker ->expects($this->once()) ->method('getUpdateState') - ->willReturn(['foo' => 'bar']); + ->willReturn(['updateVersion' => '8.1.2']); $params = [ 'isNewVersionAvailable' => true, 'lastChecked' => 'LastCheckedReturnValue', 'currentChannel' => \OCP\Util::getChannel(), 'channels' => $channels, + 'newVersionString' => '8.1.2', ]; $expected = new TemplateResponse('updatenotification', 'admin', $params, ''); @@ -154,6 +155,7 @@ class AdminControllerTest extends TestCase { 'lastChecked' => 'LastCheckedReturnValue', 'currentChannel' => \OCP\Util::getChannel(), 'channels' => $channels, + 'newVersionString' => '', ]; $expected = new TemplateResponse('updatenotification', 'admin', $params, '');