mbk-lab
/
nextcloud
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #22885 from owncloud/master-show-version-to-update-to 

Show version to update to properly
This commit is contained in:
Thomas Müller 2016-03-08 09:41:52 +01:00
parent 2ebf512412 4caa9e18b0
commit 31c89bd3a2
2 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
apps/updatenotification/controller/admincontroller.php
View File

@ -99,12 +99,13 @@ class AdminController extends Controller {
if(($key = array_search($currentChannel, $channels)) !== false) { if(($key = array_search($currentChannel, $channels)) !== false) {
unset($channels[$key]); unset($channels[$key]);
} }
$updateState = $this->updateChecker->getUpdateState();
$params = [ $params = [
'isNewVersionAvailable' => ($this->updateChecker->getUpdateState() === []) ? false : true, 'isNewVersionAvailable' => ($updateState === []) ? false : true,
'lastChecked' => $lastUpdateCheck, 'lastChecked' => $lastUpdateCheck,
'currentChannel' => $currentChannel, 'currentChannel' => $currentChannel,
'channels' => $channels, 'channels' => $channels,
'newVersionString' => ($updateState === []) ? '' : $updateState['updateVersion'],
]; ];
return new TemplateResponse($this->appName, 'admin', $params, ''); return new TemplateResponse($this->appName, 'admin', $params, '');

4
apps/updatenotification/tests/controller/AdminControllerTest.php
View File

@ -107,13 +107,14 @@ class AdminControllerTest extends TestCase {
$this->updateChecker $this->updateChecker
->expects($this->once()) ->expects($this->once())
->method('getUpdateState') ->method('getUpdateState')
->willReturn(['foo' => 'bar']); ->willReturn(['updateVersion' => '8.1.2']);
$params = [ $params = [
'isNewVersionAvailable' => true, 'isNewVersionAvailable' => true,
'lastChecked' => 'LastCheckedReturnValue', 'lastChecked' => 'LastCheckedReturnValue',
'currentChannel' => \OCP\Util::getChannel(), 'currentChannel' => \OCP\Util::getChannel(),
'channels' => $channels, 'channels' => $channels,
'newVersionString' => '8.1.2',
]; ];
$expected = new TemplateResponse('updatenotification', 'admin', $params, ''); $expected = new TemplateResponse('updatenotification', 'admin', $params, '');
@ -154,6 +155,7 @@ class AdminControllerTest extends TestCase {
'lastChecked' => 'LastCheckedReturnValue', 'lastChecked' => 'LastCheckedReturnValue',
'currentChannel' => \OCP\Util::getChannel(), 'currentChannel' => \OCP\Util::getChannel(),
'channels' => $channels, 'channels' => $channels,
'newVersionString' => '',
]; ];
$expected = new TemplateResponse('updatenotification', 'admin', $params, ''); $expected = new TemplateResponse('updatenotification', 'admin', $params, '');