diff options
| -rw-r--r-- | lib/private/ocsclient.php | 1 | ||||
| -rw-r--r-- | settings/controller/appsettingscontroller.php | 9 | ||||
| -rw-r--r-- | tests/lib/ocsclienttest.php | 2 |
3 files changed, 12 insertions, 0 deletions
diff --git a/lib/private/ocsclient.php b/lib/private/ocsclient.php index f10a97428e2..388f8f03052 100644 --- a/lib/private/ocsclient.php +++ b/lib/private/ocsclient.php @@ -284,6 +284,7 @@ class OCSClient { $app['description'] = (string)$tmp->description; $app['detailpage'] = (string)$tmp->detailpage; $app['score'] = (int)$tmp->score; + $app['level'] = (int)$tmp->approved; return $app; } diff --git a/settings/controller/appsettingscontroller.php b/settings/controller/appsettingscontroller.php index d64c945c02c..ef483cc3a03 100644 --- a/settings/controller/appsettingscontroller.php +++ b/settings/controller/appsettingscontroller.php @@ -176,6 +176,15 @@ class AppSettingsController extends Controller { $apps = array_filter($apps, function ($app) { return !$app['active']; }); + foreach($apps as $key => $app) { + if(!array_key_exists('level', $app) && array_key_exists('ocsid', $app)) { + $remoteAppEntry = $this->ocsClient->getApplication($app['ocsid']); + + if(array_key_exists('level', $remoteAppEntry)) { + $apps[$key]['level'] = $remoteAppEntry['level']; + } + } + } usort($apps, function ($a, $b) { $a = (string)$a['name']; $b = (string)$b['name']; diff --git a/tests/lib/ocsclienttest.php b/tests/lib/ocsclienttest.php index ca8a2a2a2e8..1e9e551f34e 100644 --- a/tests/lib/ocsclienttest.php +++ b/tests/lib/ocsclienttest.php @@ -732,6 +732,7 @@ class OCSClientTest extends \Test\TestCase { <downloadpackagename1></downloadpackagename1> <downloadrepository1></downloadrepository1> <downloadsize1>1</downloadsize1> + <approved>200</approved> </content> </data> </ocs> @@ -770,6 +771,7 @@ class OCSClientTest extends \Test\TestCase { 'changed' => 1404743680, 'description' => 'Placeholder for future updates', 'score' => 50, + 'level' => 200, ]; $this->assertSame($expected, $this->ocsClient->getApplication('MyId')); } |