Additions to update page

Apps to update and to disable will always be shown.
Main title changes only when apps need updated, not core.
Added bullet style.
Exclude incompatible apps from updated apps list.

5 files changed, 27 insertions, 15 deletions

diff --git a/core/css/styles.css b/core/css/styles.css
index e019b874f61..f4ef236a5c6 100644
--- a/core/css/styles.css
+++ b/core/css/styles.css
@@ -672,6 +672,13 @@ label.infield {
 	color: #ccc;
 }
 
+#body-login .update .appList {
+	list-style: disc;
+	text-align: left;
+	margin-left: 25px;
+	margin-right: 25px;
+}
+
 #body-login .v-align {
 	width: inherit;
 }
diff --git a/core/templates/update.admin.php b/core/templates/update.admin.php
index 4e28aacf023..191f727df71 100644
--- a/core/templates/update.admin.php
+++ b/core/templates/update.admin.php
@@ -1,13 +1,14 @@
 <div class="update" data-productname="<?php p($_['productName']) ?>" data-version="<?php p($_['version']) ?>">
 	<div class="updateOverview">
 		<?php if ($_['isAppsOnlyUpgrade']) { ?>
-		<h2 class="title bold"><?php p($l->t('The following apps will be updated:')); ?></h2>
+		<h2 class="title bold"><?php p($l->t('Apps update required.')); ?></h2>
 		<?php } else { ?>
 		<h2 class="title bold"><?php p($l->t('%s will be updated to version %s.',
 			array($_['productName'], $_['version']))); ?></h2>
 		<?php } ?>
 		<?php if (!empty($_['appsToUpgrade'])) { ?>
 		<div class="infogroup">
+			<span class="bold"><?php p($l->t('These apps will be updated:')); ?></span>
 			<ul class="content appList">
 				<?php foreach ($_['appsToUpgrade'] as $appInfo) { ?>
 				<li><?php p($appInfo['name']) ?> (<?php p($appInfo['id']) ?>)</li>
@@ -15,11 +16,11 @@
 			</ul>
 		</div>
 		<?php } ?>
-		<?php if (!empty($_['appList'])) { ?>
+		<?php if (!empty($_['incompatibleAppsList'])) { ?>
 		<div class="infogroup">
-			<span class="bold"><?php p($l->t('The following apps will be disabled:')) ?></span>
+			<span class="bold"><?php p($l->t('These incompatible apps will be disabled:')) ?></span>
 			<ul class="content appList">
-				<?php foreach ($_['appList'] as $appInfo) { ?>
+				<?php foreach ($_['incompatibleAppsList'] as $appInfo) { ?>
 				<li><?php p($appInfo['name']) ?> (<?php p($appInfo['id']) ?>)</li>
 				<?php } ?>
 			</ul>
@@ -30,11 +31,9 @@
 			<?php p($l->t('The theme %s has been disabled.', array($_['oldTheme']))) ?>
 		</div>
 		<?php } ?>
-		<?php if (!$_['isAppsOnlyUpgrade']) { ?>
 		<div class="infogroup bold">
 			<?php p($l->t('Please make sure that the database, the config folder and the data folder have been backed up before proceeding.')) ?>
 		</div>
-		<?php } ?>
 		<input class="updateButton" type="button" value="<?php p($l->t('Start update')) ?>">
 		<div class="infogroup">
 			<?php p($l->t('To avoid timeouts with larger installations, you can instead run the following command from your installation directory:')) ?>
diff --git a/lib/base.php b/lib/base.php
index 0a0d66aaf25..860260576dc 100644
--- a/lib/base.php
+++ b/lib/base.php
@@ -376,14 +376,15 @@ class OC {
 
 		// if not a core upgrade, then it's apps upgrade
 		if (version_compare($currentVersion, $installedVersion, '=')) {
-			$tmpl->assign('appsToUpgrade', $appManager->getAppsNeedingUpgrade());
 			$tmpl->assign('isAppsOnlyUpgrade', true);
 		} else {
-			// get third party apps
-			$version = OC_Util::getVersion();
-			$tmpl->assign('appList', $appManager->getIncompatibleApps($version));
 			$tmpl->assign('isAppsOnlyUpgrade', false);
 		}
+
+		// get third party apps
+		$ocVersion = OC_Util::getVersion();
+		$tmpl->assign('appsToUpgrade', $appManager->getAppsNeedingUpgrade($ocVersion));
+		$tmpl->assign('incompatibleAppsList', $appManager->getIncompatibleApps($ocVersion));
 		$tmpl->assign('productName', 'ownCloud'); // for now
 		$tmpl->assign('oldTheme', $oldTheme);
 		$tmpl->printPage();
diff --git a/lib/private/app/appmanager.php b/lib/private/app/appmanager.php
index 86674aa047c..75b1c0a7865 100644
--- a/lib/private/app/appmanager.php
+++ b/lib/private/app/appmanager.php
@@ -213,11 +213,12 @@ class AppManager implements IAppManager {
 	/**
 	 * Returns a list of apps that need upgrade
 	 *
+	 * @param array $version ownCloud version as array of version components
 	 * @return array list of app info from apps that need an upgrade
 	 *
 	 * @internal
 	 */
-	public function getAppsNeedingUpgrade() {
+	public function getAppsNeedingUpgrade($ocVersion) {
 		$appsToUpgrade = [];
 		$apps = $this->getInstalledApps();
 		foreach ($apps as $appId) {
@@ -226,6 +227,7 @@ class AppManager implements IAppManager {
 			if ($appDbVersion
 				&& isset($appInfo['version'])
 				&& version_compare($appInfo['version'], $appDbVersion, '>')
+				&& \OC_App::isAppCompatible($ocVersion, $appInfo)
 			) {
 				$appsToUpgrade[] = $appInfo;
 			}
@@ -258,7 +260,7 @@ class AppManager implements IAppManager {
 	/**
 	 * Returns a list of apps incompatible with the given version
 	 *
-	 * @param array $version version as array of version components
+	 * @param array $version ownCloud version as array of version components
 	 *
 	 * @return array list of app info from incompatible apps
 	 *
diff --git a/tests/lib/app/manager.php b/tests/lib/app/manager.php
index 248112722c4..7333d7601b1 100644
--- a/tests/lib/app/manager.php
+++ b/tests/lib/app/manager.php
@@ -212,9 +212,10 @@ class Manager extends \PHPUnit_Framework_TestCase {
 			->getMock();
 
 		$appInfos = [
-			'test1' => ['id' => 'test1', 'version' => '1.0.1', 'requiremax' => '8.0.0'],
+			'test1' => ['id' => 'test1', 'version' => '1.0.1', 'requiremax' => '9.0.0'],
 			'test2' => ['id' => 'test2', 'version' => '1.0.0', 'requiremin' => '8.2.0'],
 			'test3' => ['id' => 'test3', 'version' => '1.2.4', 'requiremin' => '9.0.0'],
+			'test4' => ['id' => 'test4', 'version' => '3.0.0', 'requiremin' => '8.1.0'],
 			'testnoversion' => ['id' => 'testnoversion', 'requiremin' => '8.2.0'],
 		];
 
@@ -232,12 +233,14 @@ class Manager extends \PHPUnit_Framework_TestCase {
 		$this->appConfig->setValue('test2', 'installed_version', '1.0.0');
 		$this->appConfig->setValue('test3', 'enabled', 'yes');
 		$this->appConfig->setValue('test3', 'installed_version', '1.0.0');
+		$this->appConfig->setValue('test4', 'enabled', 'yes');
+		$this->appConfig->setValue('test4', 'installed_version', '2.4.0');
 
-		$apps = $this->manager->getAppsNeedingUpgrade();
+		$apps = $this->manager->getAppsNeedingUpgrade('8.2.0');
 
 		$this->assertCount(2, $apps);
 		$this->assertEquals('test1', $apps[0]['id']);
-		$this->assertEquals('test3', $apps[1]['id']);
+		$this->assertEquals('test4', $apps[1]['id']);
 	}
 
 	public function testGetIncompatibleApps() {