Merge pull request #8986 from nextcloud/backport/8821/show-eol-warning
[stable13] Show EOL warning in the update section
This commit is contained in:
Roeland Jago Douma
GitHub
commit
cbe03cb561
|
|
@ -1,3 +1,6 @@
|
|||
#oca_updatenotification_section p {
|
||||
margin: 25px 0;
|
||||
}
|
||||
#updatenotification .warning {
|
||||
color: #ce3702;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -119,6 +119,7 @@ class AdminController extends Controller implements ISettings {
|
|||
'newVersionString' => (empty($updateState['updateVersion'])) ? '' : $updateState['updateVersion'],
|
||||
'downloadLink' => (empty($updateState['downloadLink'])) ? '' : $updateState['downloadLink'],
|
||||
'updaterEnabled' => (empty($updateState['updaterEnabled'])) ? false : $updateState['updaterEnabled'],
|
||||
'versionIsEol' => empty($updateState['versionIsEol']) ? false : $updateState['versionIsEol'],
|
||||
'isDefaultUpdateServerURL' => $updateServerURL === $defaultUpdateServerURL,
|
||||
'updateServerURL' => $updateServerURL,
|
||||
'notify_groups' => implode('|', $notifyGroups),
|
||||
|
|
|
|||
|
|
@ -48,6 +48,7 @@ class UpdateChecker {
|
|||
$result['updateAvailable'] = true;
|
||||
$result['updateVersion'] = $data['versionstring'];
|
||||
$result['updaterEnabled'] = $data['autoupdater'] === '1';
|
||||
$result['versionIsEol'] = $data['eol'] === '1';
|
||||
if(substr($data['web'], 0, 8) === 'https://') {
|
||||
$result['updateLink'] = $data['web'];
|
||||
}
|
||||
|
|
|
|||
|
|
@ -30,6 +30,16 @@
|
|||
<?php if (!empty($_['downloadLink'])) { ?>
|
||||
<a href="<?php p($_['downloadLink']); ?>" class="button<?php if ($_['updaterEnabled']) { p(' hidden'); } ?>"><?php p($l->t('Download now')) ?></a>
|
||||
<?php } ?>
|
||||
|
||||
<?php if (!empty($_['versionIsEol'])) { ?>
|
||||
<p>
|
||||
<span class="warning">
|
||||
<span class="icon icon-error"></span>
|
||||
<?php p($l->t('The version you are running is not maintained anymore. Please make sure to update to a supported version as soon as possible.')); ?>
|
||||
</span>
|
||||
</p>
|
||||
<?php } ?>
|
||||
|
||||
<?php } elseif (!$isUpdateChecked) { ?>
|
||||
<?php p($l->t('The update check is not yet finished. Please refresh the page.')); ?>
|
||||
<?php } else { ?>
|
||||
|
|
|
|||
|
|
@ -122,6 +122,7 @@ class AdminControllerTest extends TestCase {
|
|||
'updateVersion' => '8.1.2',
|
||||
'downloadLink' => 'https://downloads.nextcloud.org/server',
|
||||
'updaterEnabled' => true,
|
||||
'versionIsEol' => false,
|
||||
]);
|
||||
|
||||
$params = [
|
||||
|
|
@ -133,6 +134,7 @@ class AdminControllerTest extends TestCase {
|
|||
'newVersionString' => '8.1.2',
|
||||
'downloadLink' => 'https://downloads.nextcloud.org/server',
|
||||
'updaterEnabled' => true,
|
||||
'versionIsEol' => false,
|
||||
'isDefaultUpdateServerURL' => true,
|
||||
'updateServerURL' => 'https://updates.nextcloud.com/updater_server/',
|
||||
'notify_groups' => 'admin',
|
||||
|
|
@ -186,7 +188,8 @@ class AdminControllerTest extends TestCase {
|
|||
'channels' => $channels,
|
||||
'newVersionString' => '',
|
||||
'downloadLink' => '',
|
||||
'updaterEnabled' => 0,
|
||||
'updaterEnabled' => false,
|
||||
'versionIsEol' => false,
|
||||
'isDefaultUpdateServerURL' => true,
|
||||
'updateServerURL' => 'https://updates.nextcloud.com/updater_server/',
|
||||
'notify_groups' => 'admin',
|
||||
|
|
|
|||
|
|
@ -52,12 +52,14 @@ class UpdateCheckerTest extends TestCase {
|
|||
'web'=> 'javascript:alert(1)',
|
||||
'url'=> 'javascript:alert(2)',
|
||||
'autoupdater'=> '0',
|
||||
'eol'=> '1',
|
||||
]);
|
||||
|
||||
$expected = [
|
||||
'updateAvailable' => true,
|
||||
'updateVersion' => 'Nextcloud 123',
|
||||
'updaterEnabled' => false,
|
||||
'versionIsEol' => true,
|
||||
];
|
||||
$this->assertSame($expected, $this->updateChecker->getUpdateState());
|
||||
}
|
||||
|
|
@ -72,12 +74,14 @@ class UpdateCheckerTest extends TestCase {
|
|||
'web'=> 'https://docs.nextcloud.com/myUrl',
|
||||
'url'=> 'https://downloads.nextcloud.org/server',
|
||||
'autoupdater'=> '1',
|
||||
'eol'=> '0',
|
||||
]);
|
||||
|
||||
$expected = [
|
||||
'updateAvailable' => true,
|
||||
'updateVersion' => 'Nextcloud 123',
|
||||
'updaterEnabled' => true,
|
||||
'versionIsEol' => false,
|
||||
'updateLink' => 'https://docs.nextcloud.com/myUrl',
|
||||
'downloadLink' => 'https://downloads.nextcloud.org/server',
|
||||
];
|
||||
|
|
|
|||
|
|
@ -98,6 +98,7 @@ class VersionCheck {
|
|||
$tmp['url'] = (string)$data->url;
|
||||
$tmp['web'] = (string)$data->web;
|
||||
$tmp['autoupdater'] = (string)$data->autoupdater;
|
||||
$tmp['eol'] = isset($data->eol) ? (string)$data->eol : '0';
|
||||
} else {
|
||||
libxml_clear_errors();
|
||||
}
|
||||
|
|
|
|||
|
|
@ -85,6 +85,7 @@ class VersionCheckTest extends \Test\TestCase {
|
|||
'url' => 'https://download.example.org/community/owncloud-8.0.4.zip',
|
||||
'web' => 'http://doc.example.org/server/8.0/admin_manual/maintenance/upgrade.html',
|
||||
'autoupdater' => '0',
|
||||
'eol' => '1',
|
||||
];
|
||||
|
||||
$this->config
|
||||
|
|
@ -123,6 +124,7 @@ class VersionCheckTest extends \Test\TestCase {
|
|||
<url>https://download.example.org/community/owncloud-8.0.4.zip</url>
|
||||
<web>http://doc.example.org/server/8.0/admin_manual/maintenance/upgrade.html</web>
|
||||
<autoupdater>0</autoupdater>
|
||||
<eol>1</eol>
|
||||
</owncloud>';
|
||||
$this->updater
|
||||
->expects($this->once())
|
||||
|
|
@ -180,6 +182,7 @@ class VersionCheckTest extends \Test\TestCase {
|
|||
'url' => '',
|
||||
'web' => '',
|
||||
'autoupdater' => '',
|
||||
'eol' => '0',
|
||||
];
|
||||
|
||||
$this->config
|
||||
|
|
@ -273,6 +276,7 @@ class VersionCheckTest extends \Test\TestCase {
|
|||
'url' => '',
|
||||
'web' => '',
|
||||
'autoupdater' => '',
|
||||
'eol' => '0',
|
||||
];
|
||||
|
||||
$this->config
|
||||
|
|
|
|||
Loading…
Reference in New Issue