diff options
| author | John Molakvoæ <skjnldsv@users.noreply.github.com> | 2021-10-19 11:11:20 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-10-19 11:11:20 +0200 |
| commit | 14933214018248ab423ebaff9d322492c3a60860 (patch) | |
| tree | ce1e9d510f653daaee3801194833568b6b0c4eeb | |
| parent | 9edb59ec57f8ea6ec2d080032712f1a8bcd68b55 (diff) | |
| parent | 1237d64bdba24efdc219a4198c5bf82289d4d668 (diff) | |
| download | nextcloud-server-14933214018248ab423ebaff9d322492c3a60860.tar.gz nextcloud-server-14933214018248ab423ebaff9d322492c3a60860.zip | |
Merge pull request #29182 from nextcloud/backport/29028/stable21
| -rw-r--r-- | apps/settings/lib/Controller/AppSettingsController.php | 5 | ||||
| -rw-r--r-- | lib/private/legacy/OC_App.php | 16 |
2 files changed, 18 insertions, 3 deletions
diff --git a/apps/settings/lib/Controller/AppSettingsController.php b/apps/settings/lib/Controller/AppSettingsController.php index 4d22e90f645..059d2d99079 100644 --- a/apps/settings/lib/Controller/AppSettingsController.php +++ b/apps/settings/lib/Controller/AppSettingsController.php @@ -205,6 +205,7 @@ class AppSettingsController extends Controller { } $apps = $this->getAppsForCategory(''); + $supportedApps = $appClass->getSupportedApps(); foreach ($apps as $app) { $app['appstore'] = true; if (!array_key_exists($app['id'], $this->allApps)) { @@ -212,6 +213,10 @@ class AppSettingsController extends Controller { } else { $this->allApps[$app['id']] = array_merge($app, $this->allApps[$app['id']]); } + + if (in_array($app['id'], $supportedApps)) { + $this->allApps[$app['id']]['level'] = \OC_App::supportedApp; + } } // add bundle information diff --git a/lib/private/legacy/OC_App.php b/lib/private/legacy/OC_App.php index a02ad2aebc9..d76a34b03a4 100644 --- a/lib/private/legacy/OC_App.php +++ b/lib/private/legacy/OC_App.php @@ -777,6 +777,18 @@ class OC_App { } /** + * List all supported apps + * + * @return array + */ + public function getSupportedApps(): array { + /** @var \OCP\Support\Subscription\IRegistry $subscriptionRegistry */ + $subscriptionRegistry = \OC::$server->query(\OCP\Support\Subscription\IRegistry::class); + $supportedApps = $subscriptionRegistry->delegateGetSupportedApps(); + return $supportedApps; + } + + /** * List all apps, this is used in apps.php * * @return array @@ -790,9 +802,7 @@ class OC_App { $appList = []; $langCode = \OC::$server->getL10N('core')->getLanguageCode(); $urlGenerator = \OC::$server->getURLGenerator(); - /** @var \OCP\Support\Subscription\IRegistry $subscriptionRegistry */ - $subscriptionRegistry = \OC::$server->query(\OCP\Support\Subscription\IRegistry::class); - $supportedApps = $subscriptionRegistry->delegateGetSupportedApps(); + $supportedApps = $this->getSupportedApps(); foreach ($installedApps as $app) { if (array_search($app, $blacklist) === false) { |